Reset highwater mark *before* rolling back

David Cameronrequested to merge
issue/drupal-2800715:2800715-reset-highwater-mark into 11.x

Closes #2800715

Merge request reports