Double Munge connect retry timeout (1 to 2 secs)
Merge branch 'slurm-14.11'