Switch to Java 1.7

EVTPEG-249
Merge branch 'master' into java7
Merge branch 'master' into java7
Merge branch 'java7'