standardize the recommended upgrade command

in both docs and error messages.

Recent bug reports indicate that `cleanup` commands are essential
in some situations.
Merge pull request #4969 from rolandwalker/doc_standard_upgrade_command

standardize the recommended upgrade command