Applied patch from jira issue - OFBIZ-5902. Thanks so much Arun for this important contribution.

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