Some simplifications to the code introduced with my last commit: this will also simplify the backporting to release branches.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1627776 13f79535-47bb-0310-9956-ffa450edef68