Conflicts:
	src/plugins/select/bluegene/bl_bgq/bridge_status.cc

Conflicts:
	META
	NEWS

Conflicts:
	src/common/slurm_cred.c
	testsuite/expect/test12.2

no big deal, but now we get just a bit more memory allocated (4152 over
instead of the 4100 we were previously looking for)

Conflicts:
	configure
	doc/html/cray.shtml

they are a no-opt when they get to the DBD and we would favor having
job completion messages instead of step completion messages if possible.

or previous piecemeal method.

Adapted from a patch from Stephen Trofinoff <trofinoff@cscs.ch>

Only set memory.memsw.limit_in_bytes to the computed amount of allowed
RAM+Swap when ConstrainSwapSpace=yes in cgroup.conf.
When ConstrainSwapSpace=yes and ConstrainRAMSpace=no, automatically
set AllowedRAMSpace to 100% in order to compute the memsw.limit based
on the allocated memory plus the allowed swap percent. Then use that
limit for both mem and mem+sw limits.