ROO-3335: Roo creates new C.U. when entity changes - code formatting and clean-up