Merge branch 'trunk' of https://github.com/apache/hbase into clean
Merge branch 'clean' into 7407
HBASE-7464. [REST] Sending HTML for errors is unhelpful


git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1427567 13f79535-47bb-0310-9956-ffa450edef68
HBASE-6811 TestDrainingServer#testDrainingServerWithAbort sometimes fails in trunk

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1427739 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'trunk' of https://github.com/apache/hbase into 7407
v10