Hmm... the migration guide is for upgrading from 2.0 to 2.1, but this is for 2.2.  I think we should leave this as is, and deal with it when we come to writing a 2.2 migration guide.