Swithc back to JDK6 to support older instances running on JDK6