ACCUMULO-1939 Fix ConcurrentModificationException in MAC