use PoolFilterBuilder to replace some CriteriaRules code
Merge pull request #639 from candlepin/ckozak/criteria_rules_simplification

use PoolFilterBuilder to replace some CriteriaRules code