PHOENIX-1225

Evaluation of OR between columns in PK and not in PK incorrect. 
Please include a new unit test - perhaps in QueryIT or feel free to create your own - that demonstrates a need for the fix.