Changes for lang/java for IBM JVM and Hadoop2