Solves issue with client.start timeout which always defaults to 30 seconds
Merge pull request #935 from pveentjer/fix/maintenance-3.x/clienttimeout

Fix/maintenance 3.x/clienttimeout