More DB migration bug fixes following functional testing with a version2 database
Merge pull request #22 from peter-tackage/redesign-master-database-migration

More DB migration bug fixes following functional testing