Fix various backwards compatibility issues.
Merge remote-tracking branch 'origin/slurm-14.11'