ACCUMULO-2128 Remove warnings introduced by merge
ACCUMULO-2142 Return the HostAndPort from creating the thrift server

The GC returned the original HostAndPort object instead of the one
returned by TServerUtils, and ultimately the HsHaServer. The problem
here is that TServerUtils is doing some magic to unwind things like
0.0.0.0 as an addr and a port of 0.
Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
	test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java
Merge branch '1.6.0-SNAPSHOT'