Fix the mesos master/slave containers