Realign upgrade script with recent trunk changes