HBASE-7753 [snapshot 130201 merge] Fix unresolved merge conflicts (Ted Yu)



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