Change the apt-get install link for Java to work for either version 6 or 7.
Merge branch 'master' into query