Allow for multiple conditions types in the same override

[raae]

From a support ticket:

If there's a neater way to stack conditions of different types in your latest updates, please let me know - eg. addOn matches OR plan is in list OR user has property -> then show component.