Disable a core reservation test except on select/cons_res
Modify test for Bluegene system
Modify some tests for Bluegene systems
Merge branch 'slurm-2.5'

Conflicts:
	NEWS