r1459222 has not been backported and reported as a bug directly to me by Ruth
Unfortunately in my 1st backport try changes related to https://issues.apache.org/jira/browse/OFBIZ-4794 slipped in inadvertently, this removes them

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