am d9466f94: am 2f296598: am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev

* commit 'd9466f940ae3f04f8efede13b876d5968ff0e820':
  Sanity-check erroneous backup agent instantiations