RF-13781: Source changes required to build the cdk with jdk6