Merge "Sanity-check existence of restore agent" into jb-mr1-dev