[ARIES-1006] Full compilation support with JDK 7

Patch to fully support compilation with JDK 7