Merge pull request #1457 from rubenk/java-plugin-fixups