Applied patch from jira issue OFBIZ-5844 - Convert java files to EntityQuery.
Thanks Arun for the contribution. 

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