SWITCHYARD-1821 - Fixing issue with connection deletes