MULE-8008: Fixed cherry-pick from 7f154468e0433ff2aace030e07cdc307deec3ea8 for jdk6 files.