CDK-675: Enabling building with java8 and java9