BGQ - When --geo is requested do not impose the default conn_types.
Merge remote-tracking branch 'origin/slurm-2.5'