Merge "Avoid wfWaitForSlaves() call when in a transaction in ActiveUsers"