Merge "Sanity-check paths of files to be restored" into jb-mr2-dev