HBASE-7709 Infinite loop possible in Master/Master replication (Vasu Mariyala)

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1518410 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9326 ServerName is created using getLocalSocketAddress, breaks binding to the wildcard
           address. Revert HBASE-8640


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