draft modifications for mesos 0.20.0 - just backing up - not ready to use
If I could remember what I changed I would be a happy developer