DDF-458: Updated to build on JDK7 and JDK8.