Ported changes from MR 14455

David Cameronrequested to merge
issue/drupal-3555670:3555670-user-module-deprecations into main

Closes #3555670

Merge request reports