Merge branch 'ao-fix-approval-import-tests' into ao-make-approval-vot…

…ing-work-on-a-small-testnet

* ao-fix-approval-import-tests:
  fix expected ancestry in tests
  fix ordering in determine_new_blocks
  fix infinite loop in determine_new_blocks
  fix test assertion
  fix panic in cache_session_info_for_head
  tests: use future::join
  Clean up sizes for a workspace (#2445)
  Integrate Approval Voting into Overseer / Service / GRANDPA (#2412)
  Mitigation of SIGBUS (#2440)
  node: migrate grandpa voting rule to async api (#2422)
  Initializer + Paras Clean Up Messages When Offboarding (#2413)
  Polkadot companion for 8114 (#2437)
  Companion for substrate#8079 (#2408)
  Bump if-watch to `0.1.8` to fix panic (#2436)
  Notify collators about seconded collation (#2430)
  CancelProxy uses `reject_announcement` instead of `remove_announcement` (#2429)
  Rococo genesis 1337 (#2425)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,5 +9,5 @@ assignees: ''
 
 - It would help if you submit info about the system you are running, e.g.: operating system, kernel version, amount of available memory and swap, etc.
 - Logs could be very helpful. If possible, submit the whole log. Please format it as ```code blocks```.
-- Describe the role your node plays, e.g. validator, sentry, full node or light client.
+- Describe the role your node plays, e.g. validator, full node or light client.
 - Any command-line options were passed?