PHOENIX-1184 Phoenix 4.0 will not compile agaist CDH HBase 5.1

Conflicts:
	phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java