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