Forward port 2.5.5 and 2.6.1 upgrade scripts

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