Merge pull request #19932 from calavera/fix_config_validation

Make sure flat options are not parsed as config structures.