Preserve JDK 1.6 compatibility; add openjdk6 to travis configs.
Merge remote-tracking branch 'origin/master' into salat_2.10

Conflicts:
	project/SalatBuild.scala