fix for strudelv2_spa#151 If the user is logged out and logs in again, the control master socket may still persist. it needs to be cleared out as well

This reverts commit 1d897df2.

This reverts commit aa469396.

This reverts commit 5c03c29b.

This reverts commit 20eaccf7.