Merge branch 'master' into ao-session-info

* master:
  Improve collator side of the collator-protocol (#1955)
  add parity-keyring to install instructions (#1993)
  sane messaging defaults (#1994)
  cleanup validator discovery (#1992)
  Add Prometheus timers to the subsystems (#1923)
  Add tracing support to node (#1940)