PHOENIX-1188 Performance regression for non-aggregate queries

Conflicts:
	phoenix-core/src/main/java/org/apache/phoenix/iterate/ChunkedResultIterator.java