fix deadlock condition that can exist in the coordinator
Merge pull request #670 from metamx/fix-deadlock

fix deadlock condition that can exist in the coordinator