really disable ControlMaster
Merge pull request #1956 from schmurfy/controlmaster

Cohabitation with terminal (with ControlMaster)