CB-8081 Allow gradle builds to use Java 6 instead of requiring 7