ALPS - Add SubAllocate to cray.conf file for those who like the way <=2.5
did the ALPS reservation.  Bug 1115
Merge remote-tracking branch 'origin/slurm-14.03'

Conflicts:
	src/plugins/select/alps/cray_config.h