Reverted r1610695 where I backported the fix for OFBIZ-5338 but the fix requires some enhancements to set-service-fields that were not backported into the branch

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