HBASE-12337 Import tool fails with NullPointerException if clusterIds is not initialized
HBASE-12471 Task 4. replace internal ConnectionManager#{delete,get}Connection use with #close, #createConnection (0.98, 0.99)

Conflicts:
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
	hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
	hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java
	hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
HBASE-12449 Use the max timestamp of current or old cell's timestamp in HRegion.append()
HBASE-12411 Optionally enable p-reads and private readers for compactions.
HBASE-12495 Use interfaces in the shell scripts (Solomon Duskis)

Conflicts:
	hbase-shell/src/main/ruby/hbase/quotas.rb
HBASE-12517 Ensure HConstants members are final.

Signed-off-by: stack <stack@apache.org>

Conflicts:
	hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
HBASE-12513 Graceful stop script does not restore the balancer state

Signed-off-by: stack <stack@apache.org>
HBASE-12496 A blockedRequestsCount metric (Yi Deng)
Revert "HBASE-12471 Task 4. replace internal ConnectionManager#{delete,get}Connection use with #close, #createConnection (0.98, 0.99)"

This reverts commit 4f5cde8a698b4d416694842c2e82114a44fc0471.