Forward port 2.5.5 and 2.6.1 upgrade scripts