Hand squash merge out from mesos repository as github is not canonical.

Once we have a canonical root location we will need to squash merge all
our changes into a single thunk to absorb.