2.0 -> 2.1 migration scripts #2090

Ready for review, all the prerequisites got merged.