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
Merge branch 'master' of https://github.com/apache/phoenix into logging-custom-annotations