Forward-port upgrade scripts from recent releases

In accordance with LP #894052.

Signed-off-by: Dan Wells <dbw2@calvin.edu>