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)
I think this is really, really gross, and will definitely cause issues in the future.  "origin/docs" is essentially another "release" branch, so what we're doing here is merging the release branch onto itself, but potentially with cherry-picked commits that won't merge cleanly (which is why we don't ever merge a hotfix branch back to master, for example).