[OPTIQ-399] Factorize common AND factors out of OR predicates