Moved update operation outside for to prevent ConcurrentModificationException
Merge branch 'phase1' of https://github.com/mesos/myriad into phase1