Backport 3a02b99a12a6 to stable so we can build ("The name of the Java 1.6 alternative has changed from java-6-openjdk to java-1.6.0-openjdk in a recent security update (sigh).")