Resolve #3581058 "Mockobject fixes"

David Cameronrequested to merge
issue/drupal-3581058:3581058-mockobject-fixes into main

Closes #3581058

Merge request reports