CRAY - fix issue with accelerators on a cray when parsing BASIL 1.3 XML.
Merge remote-tracking branch 'origin/slurm-2.6'