Adding support for mesos 0.20.0