Fix migration in cases where database name has a hyphen

Merged feld requested to merge fix-migration into develop

Merge request reports