Bug 4105: Change commit retry mechanism in EntityOwnershipShard