IP-1445: Upgrade code to Java 1.7