reworking controlmaster/controlpath for iaas