[OE-3856] adjusted migration order to prevent issues migrating from 1.6 -> develop