am 71c92b35: Merge "Properly saving migration cling keys." into jb-ub-now-kermit-release

* commit '71c92b356099c90d52a848981855be3fef5c895f':
  Properly saving migration cling keys.