fix vagrant vm
protect some services to be run in mastersalt mode, cc @regilero
Merge remote-tracking branch 'origin/master' into stable