MDL-43749 fixup! add missing bit of upgrade script.
MDL-43749 fixup! complete the TODOs.