Merge any `docs` branch updates into hotfix branch

and also separate the 3 doc release/test phases to where I /think/
they're intended to go

I think that by merging any docs update release changes
into the hotfix branch, the rest of the release process is simplified.

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Except cherry-picks on the docs branch should _only_ ever come from master (ie, get it merged to master, then cherry-pick it to docs), so "docs" has cherry-picked contents from master, and thus needs to be force-pushed on top of at release time since the merge won't ever work properly, but also because the changes on the docs branch should already be in master and thus be in the release we're overwriting the docs branch with.