fixes #520 - fixed two races in TaskTracker
Merge pull request #521 from mesosphere/wip-fix-tasktracker-drexin

fixes #520 - fixed two races in TaskTracker