Completes r1645954, I got a power outage here and things got complicated :/

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1645977 13f79535-47bb-0310-9956-ffa450edef68