Merge pull request #2 from airbnb/staging

Fixed bad resource comparison.
Fixed MESOS-1058: check failure in the master.

Review: https://reviews.apache.org/r/18828