PHOENIX-1370 Allow query timeout to differ from RPC timeout

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