HBASE-9327 retryTime log is confusing

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1517088 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/trunk@1517095 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd