Don't restore any setting that we don't think should be backed up

The ad-hoc blacklist has been replaced by a check that whitelists each restored
datum against the set of keys that we actually back up.  Keys read from the
restore data which are not found in the whitelist are not applied.

Also adds in some more debugging output, marked to be disabled for ship.
1 file changed