Task 3628: 2.2 to 3.1 migration

Simple migration.  There are many additions to the MDES schema but few changes as explained in the ticket.