ROO-3335: Roo creates new C.U. when entity changes

Merged contribution from Chema to retain JavaDoc and other comments.