Bug 1102273: Make domain scopes additive
Ensure at least one scope's conditions are met, even when combined with complex queries
Merge pull request #5455 from liggitt/scope_complex_conditions

Merged by openshift-bot