Merge "Tweaked User::READ_LOCKING to use LOCK IN SHARE MODE"