Merge branch 'doc-update-8.5-to-8.6-fix-steps-order' into 'master'

Fix order of steps to prevent PostgreSQL errors when running migration

Supersedes https://github.com/gitlabhq/gitlabhq/pull/10100.

/cc @stanhu @rodrigomanhaes

See merge request !3355