(OFBIZ-10331) Applied slightly modified patch from jira ticket, Thanks Dennis Balkir for your contribution git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1835889 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10175) git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1821789 13f79535-47bb-0310-9956-ffa450edef68