Fix a couple conditional-logic types issues

[ryanwersal]

Allow keyvaluelist collections of conditionals and update legacy conditional logic types to re-export the latest conditional logic types.