HBASE-12587 TestReplicationTrackerZKImpl.testPeerRemovedEvent timedout
HBASE-12580 Zookeeper instantiated even though we might not need it in the shell (Alex Newman)
HBASE-12072 Standardize retry handling for master operations

Conflicts:
	hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/RowTooBigException.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/flush/MasterFlushTableProcedureManager.java
	hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicasClient.java
	hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java
HBASE-12053: SecurityBulkLoadEndPoint set 777 permission on input data files
HBASE-12533: staging directories are not deleted after secure bulk load
HBASE-12558 TestHCM.testClusterStatus Unexpected exception, expected<org.apache.hadoop.hbase.regionserver.RegionServerStoppedException> but was<junit.framework.AssertionFailedError> -- DISABLING FAILING TEST
HBASE-12581 TestCellACLWithMultipleVersions failing since task 5 HBASE-12404 (HBASE-12404 addendum) -- SLEEP ADDENDUM
HBASE-10536 ImportTsv should fail fast if any of the column family passed to the job is not present in the table (denny joesph)
HBASE-12519 Remove tabs used as whitespace (Varun Saxena)
HBASE-12491 TableMapReduceUtil.findContainingJar() NPE
HBASE-12595 Use Connection.getTable() in table.rb (Solomon Duskis)