DDF-856: Update ddf-catalog to use Java 7