fixing concat_minions_logs and max_jobs
Merge branch 'script-password' into glb