MX-1207, make the socket timeout tunable
Merge branch 'bugfixes/tokumx-1.5' into releases/tokumx-1.5