rhbz1074365 Prevent thread leaks on redeploy