Merging Accumulo-1070 trunk changes to 1.5-Auditing, by hand