HBASE-7904 Make mapreduce jobs pass based on 2.0.4-alpha (Ted Yu)



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