Hg: Merge in local migration fixes
--HG-- extra : convert_revision : 0ab7b398d309c84f847582bf0acfd060f5d0936a