PHOENIX-1251 Salted queries with range scan become full table scans
Merge branch '4.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 4.0

Conflicts:
	phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
PHOENIX-1251 Salted queries with range scan become full table scans