HBASE-9319 Apply 'HBASE-7685 Closing socket connection can't be removed from SecureClient' to trunk

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1516885 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9320 Up timeouts on NamespaceUpgrades timeouts

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