Merge "Permission fix: don't require BACKUP perm for self-restores"