Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev