HBASE-7858 cleanup before merging snapshots branch to trunk (Ted Yu)


git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/hbase-7290v2@1447967 13f79535-47bb-0310-9956-ffa450edef68