Fix qos web page formatting

There was a cut/paste problem with duplicate information, which
has been removed.
Also minor format change (added some spaces).
Fix Centos5 compile errors.

Bug #1276
Update MVAPICH2 integration info
Merge branch 'slurm-14.11'