generalize guard in conflict resolution to handle non-equality binary predicates

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable