Comment 4 for bug 1746265

Also added 2.2 as this is the version where the reporter was coming from. We are unlikely to release another 2.2 but we might need to provide a way forward via a script rather than an upgrade step...