A number of unrelated changes had slipped in in r1639606.
This reverts them

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