PHOENIX-1226 Exception in Tracing

Phoenix tracing expects annotation values to be integers, but HBase writes
non-integer values in its traces (which end up in the phoenix sink)
PHOENIX-1225 Evaluation of OR between columns in PK and not in PK incorrect (ycchung, shcchen, kathylin, NTHU-SSLAB)
First pass at custom tracing annotations
Merge upstream changes