Move master to Java 1.7

Closes #5267