fixed upgrade strategy to convert form_type correctly (fixes #3190)