bug-21977: Update to Java 1.7