[COMBO] Updates to allow building combination sets of configurations