HBASE-9327 retryTime log is confusing

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.95@1517089 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9318: Procedure#waitForLatch may not throw error even there is one

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