[OE-3856] migration fixes resulting from out-of-sequence migrations