DDF-247: Cleaning up maven group ids