Merge "Fix BackupSettingsTest (update blacklists)" into oc-dev