additional java class lex and prep stmt lex, plugin prep
Merge commit '0551e06c93cc'

Conflicts:
	java/java.go