ACCUMULO-2422 reset watch on non-delete events
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
ACCUMULO-2422 reset watch on non-delete events
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT