Merge pull request #4 from airbnb/staging

Fixed MESOS-1058: check failure in the master.
Merge pull request #5 from airbnb/staging

Follow up fix for 5ce02865c.
Fix for preemption from 9f6891c.