CDK-675: Enabling building with java8