Merge "tolerate HTTPNotFound in scenario manager teardown"