Remove unused local variable
PHOENIX-1237 COALESCE Function - type of second parameter (Vaclav Loffelmann)
Custom tracing annotations PHOENIX-1196
PHOENIX-1262 Generate phoenix-server jar with and without antlr
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.
PHOENIX-1266 Disallow setting NOT NULL constraint on non PK columns
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/phoenix
Phoenix-1044 : Changes to PhoenixRecordReader to fix the scan.
Phoenix 1050 : Support for DataByteArray.
PHOENIX-1268 Misleading exception when attempting to drop system table
PHOENIX-1285 Override default for histogram depth in QueryServicesTestImpl
PHOENIX-1284 Override config properties for unit tests not making it to server

Conflicts:
	phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
	phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
	phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
Adding missing files from fix for PHOENIX-1284
PHOENIX-1284 Override config properties for unit tests not making it to server
PHOENIX-103 Drop hadoop1.0 specifics from code
PHOENIX-1280 ColumnProjectionFilter creates too many ImmutableBytesPtrs
PHOENIX-1288 Fix selecting multiple array indexes

Don't attempt to remove the same Cell multiple times when
transforming multiple array index references into a single
filtered Cell.