Merge branch 'master' into ao-validator-discovery-api

* master:
  Collator protocol followup (#1741)
  Revert "Remove Old Service, 2nd try (#1732)" (#1758)
  Remove Old Service, 2nd try (#1732)
  collation-generation: guide and tidying (#1753)
  Companion for #7111 (Introduce `cancel_proposal` and `blacklist`) (#1728)
  Parachains: Introduce a dummy module to include the Origin. (#1749)
  provisioner tests: remove tokio from dev-dependencies (#1745)