Properly merge role conditionals in with pre-existing conditionals

Fixes #7387