ACCUMULO-1585 sometimes addresses are advertized as host+port
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo