HBASE-1015

This is a cumulative pull request for sub tasks of HBASE-1015.