HBASE-9843 Various fixes in client code

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.96@1536871 13f79535-47bb-0310-9956-ffa450edef68
Merge branch '0.96' into ddas