Merge "Adding tighter first run checks for migration clings. (Bug 12626290)" into jb-ub-now-kermit