Adding other files to replace in source tree to be compliant with JDK7