Do not kill background services when a client leaves

This fixes a bug introduced in 15248e38df5 and brings back
the unit-tests to a normal state (ie, only 2 break, as expected)