HBASE-10480 TestLogRollPeriod#testWithEdits may fail due to insufficient waiting

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1565776 13f79535-47bb-0310-9956-ffa450edef68
HBASE-10340 [BACKPORT] HBASE-9892 Add info port to ServerName to support multi instances in a node

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1565828 13f79535-47bb-0310-9956-ffa450edef68