First pass at PHOENIX-1198: added custom annotations to client-side log lines that are within the scope of a user operation
PHOENIX-180 Use stats to guide query parallelization (Ramkrishna S Vasudevan)
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/phoenix
PHOENIX-1258 Fix RegexpSubstrFunction serialization

Correct deserialization of RegexpSubstrFunction so that it can
be used in filters and group-by statements.

Contributed by Jay Wong.
Merge branch 'master' of https://github.com/apache/phoenix into logging-custom-annotations