Merge "Tightening migration conditions. (Bug 11973614)" into jb-ub-now-kermit