SWITCHYARD-1551 make stopped behavior consistent across gateways