Merge "Properly saving migration cling keys." into jb-ub-now-kermit