ACCUMULO-1577 committing Michael Berman's patch to 1.5
ACCUMULO-1585 track tablet servers by their entry in zookeeper, not by
their resolved address
ACCUMULO-1601 make interface hinting consistent across all servers
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
ACCUMULO-1601 trace server needs to bind to the interface passed on the command line
ACCUMULO-1585 remove AddressUtil from server
ACCUMULO-1585 fix tracer registration in zookeeper
ACCUMULO-1585 forgot to add new file
ACCUMULO-804 move to a version of 2.0 that can be found in the public repos
ACCUMULO-1537 applying Michael Berman's patches to make switching between the different MacTest classes easier
ACCUMULO-1537 applying Michael Berman's patches to make switching between the different MacTest classes easier, adding missing files
ACCUMULO-1537 fix build for hadoop-2
ACCUMULO-1545 Switch to UTF-8 Charset constant instead of string literals
ACCUMULO-1500 Fix rat for switch to git, and other git and url fixes
ACCUMULO-1500 Merge branch '1.5.1-SNAPSHOT'

Conflicts:
	pom.xml
ACCUMULO-1605 avoid recursion in Span#traceId
Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT'
ACCUMULO-1602 compactor to set thread name
Merge branch '1.5.1-SNAPSHOT'
ACCUMULO-1000 added conditional mutations to Accumulo