Additional patches for FreeBSD support in Slurm v2.6