Applied fix from trunk for revisions: 1517947, 1517702, 1517629, 1518950

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