ACCUMULO-2438 Backport the changes to ensure that we watch separate sets of tables for merges