refactor active vid functionality to make it easier to fix 3583390

Alex Pottrequested to merge
issue/node_revision_delete-3583390:3583390-revision-translation-affected into 2.1.x

Closes #3583390

Merge request reports