Bug 1102273: Make domain scopes additive
Ensure at least one scope's conditions are met, even when combined with complex queries
Bug 1101836: Apache shouldn't disable backend when it can't connect to it.
Merge pull request #5455 from liggitt/scope_complex_conditions

Merged by openshift-bot
Merge pull request #5456 from mrunalp/bug/1101836

Merged by openshift-bot