Add serialization error handling when reading in configs that have problems: so we don't lose extra stuff when writing it back out, only the problematic stuff.
Merge remote-tracking branch 'remotes/sall/master' into record