Automatic merge from submit-queue Remove old references to contrib/mesos @deads2k @k82cn @derekwaynecarr