Backported GenericEntity immutable fixes from the trunk.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1486304 13f79535-47bb-0310-9956-ffa450edef68