Properly merge role conditionals in with pre-existing conditionals

Fixes #7387
Merge pull request #7393 from jimi-c/issue_7387_role_conditionals

Properly merge role conditionals in with pre-existing conditionals