extend fix-key-location to handle cases from broken cross-storage moves#36068

icewind1991 merged 2 commits intomasternextcloud/server:masterfrom

gf-encryption-fixnextcloud/server:gf-encryption-fixCopy head branch name to clipboard