hansmi helped me with merging the conflict. Thanks

Conflicts:
	lib/workerpool.py

Signed-off-by: René Nussbaumer <rn@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>