Merge "incidentd: fix memory leaks in a test"