Forward-port 2.5.7 upgrade script

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