PHOENIX-1225

Evaluation of OR between columns in PK and not in PK incorrect. 
Also, add the @Category(HBaseManagedTimeTest.class) annotation