HCOLL-152 - udpated the java version to 1.7
Merge remote-tracking branch 'origin/master'