Issue #2865497 by quietone, pritish.kumar, Jo Fitzgerald, moshe weitzman, phenaproxima: Fix high-water condition for new migrations