HBASE-7904 Make mapreduce jobs pass based on 2.0.4-alpha



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