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