SWITCHYARD-1686 ensure service references are cleaned up on undeploy