Changed requirement for Java 7 to be  Java 6. Need to upgrade local to 7
Merge remote-tracking branch 'remotes/origin/prototype-rc1' into prototype-rc1