Updated build to use Java 1.7 language
Merge branch 'testing' into dev/mspaulding/java-updates-green
Merge branch 'dev/mspaulding/java-updates-green' into testing