Resolve #3538669 "Controllerresolver should use"

julio retkwarequested to merge
issue/drupal-3538669:3538669-controllerresolver-should-use into 11.x

Closes #3538669

Merge request reports