A few fixes to marathon and mesos checks
remove unneeded changes
Merge branch 'master' into couch_basic_auth