Update to reflect latest Mesos xcon branch