Forward-port 2.5.2-2.5.3 upgrade script

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