Merge "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""" into udc-dev