Corrections to job_container/cray Makefile
Rename plugin from job_container/cray to job_container/cncu
Merge branch 'master' of http://github.com/SchedMD/slurm

Conflicts:
	configure