PHOENIX-1375 Remove references to incubation
PHOENIX-1373: Ctrl-C out of sqlline causes terminal to be useless
PHOENIX-944 Support derived tables in FROM clause that needs extra steps of client-side aggregation or other processing
PHOENIX-1366 ORDINAL_POSITION incorrect for multi-tenant table over tenant-specific connection (Bruno Dumon)
PHOENIX-1366 Use static constants
PHOENIX-1382: Phoenix 4.2 RC Issue
PHOENIX-897 Quote parameters in psql.py

Properly quote supplied command-line parameters in psql.py so that
it's possible to supply any character (including ones that have
special meanings in various shells) as parameters.
PHOENIX-1385 Adding, dropping and adding columns fails with NPE (Samarth Jain, James Taylor)
PHOENIX-1376 java.lang.NullPointerException occurs in JDBC driver
PHOENIX-1390 Stats not updated on client after major compaction

Conflicts:
	phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java

Conflicts:
	phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
	phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
	phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
	phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
	phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
	phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
	phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
	phoenix-core/src/main/java/org/apache/phoenix/schema/stats/PTableStatsImpl.java
	phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
	phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsUtil.java
PHOENIX-1391 Remove obsolete hint

Conflicts:
	phoenix-core/src/main/java/org/apache/phoenix/execute/BaseQueryPlan.java
Update QueryPlanTest to remove reverse test
Update CHANGES