Issue #2546993 by mikeryan, phenaproxima: Move last stragglers of module-specific migrations into the appropriate modules