[JCLOUDS-41] Fixing broken JDK 6 build