Add munge connect retry
Merge branch 'slurm-2.6'