Bugfix: avoid clobbering of valid variants when a config key contains a superset of values of the same key in a lower priority cbc.yaml

Bugfix: avoid clobbering of valid variants when a config key contains a superset of values of the same key in a lower priority cbc.yaml #2668