reverted java 1.6 changes. Turns our Alfresco 4.2 requires java 1.7 anyways so no need to support earlier versions