Merge "Bug 494418 : classpath build fix for hudson build"