Minor changes to the makefiles.
Remove building php by default in contribs.
Merge remote-tracking branch 'origin/slurm-14.11'