Sync up with 2.4 branch
Support a basic --java7 command that always installs java7
Merge branch 'dev' into 2.4