Merge "Remove User::EDIT_TOKEN_SUFFIX, a deprecated constant since 1.27."