The connector never times out if one is not defined. This seems to help make the mxs1985_kill_hang test a lot more stable.
This fixes the problem where an encrypted connection would not be created even though the option for it was there. Also made it configurable outside of the constructor to make it easier to use in tests.
A link with the old directory name is provided.