Applied bug from trunk r1618359.
Applied patch for bug fix reported in jira task at OFBIZ-4973 - AvsSettings screenlet read data bug, entity-one should be used, not entity-and.
Thanks Oliver for reporting the issue and providing the fix. Thanks team ofbiz.us for the verification.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1618361 13f79535-47bb-0310-9956-ffa450edef68