Merged from trunk r1509510:
Fix bug preventing deadlock retries for groovy services, GenericEngine implementations and services should never modify the service context

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