HBASE-12645 HBaseTestingUtility is using ${$HOME} for rootDir (Varun Saxena)
HBASE-12645 HBaseTestingUtility is using ${$HOME} for rootDir (Varun Saxena) -- ADDENDUM
HBASE-12652 Allow unmanaged connections in MetaTableAccessor (Solomon Duskis); REAPPLY
HBASE-12625 Deprecate certain methods in classes annotated with InterfaceAudience.Public in branch-1
HBASE-12640 Add Thrift-over-HTTPS and doAs support for Thrift Server
HBASE-12704 Add demo client which uses doAs functionality on Thrift-over-HTTPS
HBASE-12640 Add Thrift-over-HTTPS and doAs support for Thrift Server -- ADDENDUM
HBASE-12683 Compilation with hadoop-2.7.0-SNAPSHOT is broken - ADDENDUM
HBASE-12640 Addendum fixes TestThriftHttpServer (Srikanth Srungarapu)
HBASE-11412 Minimize a number of hbase-client transitive dependencies (Sergey Beryozkin)
Update pom.xml version for 1.1.0-SNAPSHOT for branch-1
HBASE-12223 MultiTableInputFormatBase.getSplits is too slow (Yuanbo Peng)
HBASE-12694 testTableExistsIfTheSpecifiedTableRegionIsSplitParent in TestSplitTransactionOnCluster class leaves regions in transition (Vandana Ayyalasomayajula)
Revert "HBASE-12694 testTableExistsIfTheSpecifiedTableRegionIsSplitParent in TestSplitTransactionOnCluster class leaves regions in transition (Vandana Ayyalasomayajula)"

This reverts commit 7fbee896f488405bc883a533f842c77422dee18d.
HBASE-10201 Port 'Make flush decisions per column family' to trunk

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

Conflicts:
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
HBASE-10201 Addendum changes TestPerColumnFamilyFlush to LargeTest