Merged from trunk r1580620:
Fix bug that causes a service to keep retrying after a deadlock occurs until lockRetriesRemaining reached zero

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1580635 13f79535-47bb-0310-9956-ffa450edef68