ISIS-537 Build with JDK 1.7. Revert later is necessary