HBASE-9165 Addendum, fix TestTableMapreduce

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1542642 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9834: Minimize byte[] copies for 'smart' clients (again)

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1542645 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/0.94' into 0.94-gd