HBASE-9001 TestThriftServerCmdLine.testRunThriftServer[0] failed

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1504988 13f79535-47bb-0310-9956-ffa450edef68
HBASE-7875 introduce a compaction switch in HBase Shell (Liang Xie)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1505060 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd