Bug 956444 - handle migration sentinel

This embraces and extends @rnewman's earlier work.