More changes to mesos based images and revised kill_all