@kdillen:
But I do know that some things get corrupt when importing a 2.1.x file into 2.2
In my case I had the following problems with corrupt files:
ssh host key files
unbound: root.key (auto-trust-anchor-file)
That's absolutely not true. Those two things don't even exist in the config.
It's always safe to restore the full config from an older version to a newer version (but going backwards, say restoring 2.2 to 2.1, is not possible).
Trying to snip out pieces of an old config backup and paste them into a new config isn't a good idea unless you really know what you're doing, as those pieces may require config upgrades when migrating to a new version that they won't get if you're pulling in partial config bits.