Merge "registration: Fix adding $formerGlobals in conversion script"