Remove vestigial check for llapi.h file at configure time
Merge branch 'slurm-2.5'