These are adjustments based on someone using the new standby upgrade
steps.

Report by Andy Colson

Backpatch through 9.5