Add config upgrade code to validate changes made on c2fe67eb and d269747b. It fixes #4134