finalized upgrade script
finalized upgrade script


Former-commit-id: ab307e39701871481111a2d7687b6597b8e32443 [formerly 5e13aa8929101db908f5494b2dfc0a3f965eca99]
Former-commit-id: 7fa4a59fbad876d5b35da65410516da4578b4dff
andrewplummer/Sugar,romancow/Sugar,andrewplummer/Sugar,romancow/Sugar