Merge branch 'migration-script-issues' into 'master'

Migration script issues

See merge request !1289
41 jobs for 1466-empty-map-is-invalid-in-16alpha-1 in 41 minutes and 6 seconds (queued for 8 minutes and 30 seconds)
Name Stage Failure
failed
test:frontend Test
=============================== Coverage summary ===============================
Statements : 85.18% ( 16503/19375 )
Branches : 68.78% ( 3261/4741 )
Functions : 81.95% ( 3079/3757 )
Lines : 85.23% ( 16499/19359 )
================================================================================
npm ERR! Test failed. See above for more details.
Cleaning up file based variables
ERROR: Job failed: exit code 1