HBASE-10566 cleanup rpcTimeout in the client - addendum

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