Merge "Bug 526716 - codegenerator.ui plugin fails to compile due to missing classpath"