Using Sufia::Messages, fixes #9473
Ensure return_controller is specified, fixes #9466
Updating hydra-collections