Merge "Sanity-check backup agent name prior to instantiation"