Cherry-pick bug-fixes from AMPLab repo

This merges in the fix to the zombie workers problem.