Merge pull request #581 from berryma4/3.3.x

Fix Compiler errors when not using Oracle JDK
fixing imports and classpaths for tycho build