[OFBIZ-4838] Applied more recent patch. Thanks Tom Burns for reporting the issue and providing the fix. 
Thanks Deepak Dixit for testing and making adjustments to the patch.

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