Fixes added manually on top of bot's changes

Balu Ertlrequested to merge
issue/node_revision_delete-3433600:3433600-automated-drupal-11 into 2.0.x

Closes #3433600

Merge request reports