Fix #10140 Fix #12705

Conflicts:
	salt/client/ssh/__init__.py
Cherry fixes for zmq issue on debian tracker