- apply a timeout to all join() calls for test_pool
- use thread.join() for waiters_handled test

Conflicts:
	test/engine/test_pool.py