HBASE-9156  2000ms timeout for some client calls

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