added thread.join when killing threads on `stop` to prevent race conditions
added thread.join when killing threads on `stop` to prevent race conditions

sonewman/mock_web_service,Greenfields/mock_web_service