More fixes relating to #907248 .. ensure that the migrated site returns the new values from the config.