Merge "Check User::getId() in makeTestEdits.php"