Merge "Moved patrol code in commitRollback() down to reduce contention"