[DROOLS-296] rewrite or constraints when necessary
Merge pull request #285 from sotty/5.6.x

 [DROOLS-296] rewrite or constraints when necessary