Merge branch 'addressbook-uid-check-migration' of...

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

 into addressbook-uid-check-migration

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