Merge branch 'addressbook-uid-check-migration' of https://github.com/nextcloud/server...

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

diff --cc tests/lib/Repair/SetVcardDatabaseUIDTest.php
index fe1a7481d7b3da3b54b630fe40e86430a62c0d9b,59a115ba75534b7d35a465452014ece61e3e2259..97da3c6a901de3ab1099e08e899a2073ef642821
--- 1/tests/lib/Repair/SetVcardDatabaseUIDTest.php
--- 2/tests/lib/Repair/SetVcardDatabaseUIDTest.php
+++ b/tests/lib/Repair/SetVcardDatabaseUIDTest.php
@@@ -118,4 -118,4 +118,4 @@@ class SetVcardDatabaseUIDTest extends T
                $this->assertEquals($expected, $this->invokePrivate($this->repair, 'shouldRun'));
        }
  
--}
++}