Bumped Mesos version and merged port fix