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

* commit '1ea75b88b7ac4273b7a5395c5c57c6453d6cd3d1':
  Sanity-check erroneous backup agent instantiations