HBASE-7329 Remove duplicate code in newly added files



git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1436679 13f79535-47bb-0310-9956-ffa450edef68