A bunch of upgrades to work with the last version of Salt and Mongo.

I don't remember the details, check the diff :)