Reduce the tightness of AddMSecsWorks() bounds.

The time elapsed is in the range 30-34 on a Gentoo system.

As long as the elapsed time is between 25 and 51 ms the addMSecs call did work,
it may just take longer to get our timeslice back on some systems than others.
Remove unnecessary include.
Properly link with zmq stuff in tests.

When running the tests we were dynamically linking with the
installed versions of these libraries rather than the just
compiled versions as we should be.

Thanks go to Raymond Wagner for identifying the problem.
Merge remote-tracking branch 'upstream/master'