Merge branch 'master' into rh-grandpa-offline-fallback

Fixing the conflicts requires (re)writing some code to properly
integrate with the changes from #1808. This commit just comments all
code that is conflicting/non-working replacing it with `unreachable!()`
statements. I prefer for the integration to be explicit over follow-up
commits rather than being buried in a merge commit.