Merge "user: Ensure returned user groups are sorted"

diff --combined RELEASE-NOTES-1.33
index 759d912,e8d5793..3dfca9a
--- 1/RELEASE-NOTES-1.33
--- 2/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@@ -64,6 -64,8 +64,8 @@@ production
  * …
  
  === Bug fixes in 1.33 ===
+ * (T164211) Special:UserRights could sometimes fail with a
+   "conflict detected" error when there weren't any conflicts.
  * …
  
  === Action API changes in 1.33 ===
@@@ -193,11 -195,6 +195,11 @@@ because of Phabricator reports
    Title::getDBKey(), which doesn't vary case.
  * User::getPasswordValidity() is now deprecated. User::checkPasswordValidity()
    returns the same information in a more useful format.
 +* For Linker::generateTOC() and Linker::tocList(), passing strings or booleans
 +  as the $lang parameter was deprecated. The same applies to DummyLinker.
 +* The PasswordPolicy 'PasswordCannotBePopular' has been deprecated. To
 +  follow best practices, it is reccommended to use 'PasswordNotInLargeBlacklist'
 +  instead which blacklists 100,000 commonly used passwords.
  * …
  
  === Other changes in 1.33 ===