Merge "deb: fix recovery code" into jb-mr2-dev