Upgrade chonos and mesos
Include Mesos in Build