Now that JDK7 is directly in Raspian use that.
Merge branch 'master' into md25