Fix classpath build issue
Merge branch 'master' into oracle