HBASE-9139 Independent timeout configuration for rpc channel between cluster nodes (Julian Zhou)

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.95@1513338 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9202 TestThriftServerCmdLine.testRunThriftServer[18] fails

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