Merge branch 'trunk' of https://github.com/apache/hbase into clean
Merge branch 'clean' into 7407