Comment 10 for bug 1441750

I've taken a look at this and updated the upgrade script to account for some minor drift since it was initially put together. Pushed to master through rel_3_9 to put this behind us one more time (only putting it in master would potentially require different upgrade scripts for >= 3.11 and <= 3.10 which is no good). Thanks Ben and Jason!