ACCUMULO-3351 Remove use of deprecated trace code in 1.7.x
ACCUMULO-3355 Broke this IT in the process. Need to check a few times to give the tracer time to write to the table.
Merge branch '1.6'