ACCUMULO-1537 committing Michael Berman's patch to run against IPV6 enabled macs
Merge remote-tracking branch 'asf/master' into ACCUMULO-210