Restore 1sec msg connect retry

This largely reverts commit 0ec2af2735ee91b46fd5b59a9cd1318ef3411aca
just to cut down on some logging
Merge branch 'slurm-2.6' into slurm-14.03

Conflicts:
	src/common/slurm_protocol_api.c
Merge branch 'slurm-14.03'