Reduce timeout's by a third.
Remove unused code.
Define the local client a bit latter. Refs #1935.

This seems to fix #1935. It also fixes the issue we had in which the test-suite would not finish properly it would just hang.
Merge pull request #4559 from s0undt3ch/hotfix/fix-travis-again

Fix travis again