[OE-4339] - fix migration to set changing fields to default of 1 to pick up whatever dropdown value
Merge remote-tracking branch 'origin/release/1.7' into release/1.7