Syncing offer migrations with the latest from master. A recent cherry pick brought in a later offer migration so this is to bring them inline to save any further migrations issues later on.