HBASE-7649 ADDENDUM client retry timeout doesn't need to do x2 fallback when going to different server

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.95@1485514 13f79535-47bb-0310-9956-ffa450edef68
HBASE-8564 ADDENDUM TestMetricsRegionServer depends on test order

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