DDF-866 - updating to the latest ddf-parent