Merge "Add comment to unused EDIT_DEFER_UPDATES in Defines.php"