Conflicts:
	src/plugins/proctrack/cgroup/proctrack_cgroup.c

There was already cgroup locking in the version 14.03 code base
using different variable names and slighly different logic from
that in commit 3f6d9e36.
This commit is a variant of that commit in order to make the logic
in version 2.6 match that of our next release (logic which is
already pretty well tested).
bug 447

proctrack/cgroup - Add locking to prevent race condition where one job step
is ending for a user or job at the same time another job stepsis starting
and the user or job container is deleted from under the starting job step.
bug 447

Conflicts:
	NEWS
	src/common/gres.h
	src/slurmctld/node_scheduler.c

This eliminates some now redundant arrays and variable copying
introduced in commit 74d1a4b4
bug 525

Substantial performance improvement for systems with Shared=YES or FORCE
and large numbers of running jobs (replace bubble sort with quick sort).
Bug 525

Remove trailing spaces
No changes in logic

Original code worked only for Cray systems. For other systems it
set gres_alloc to the total number of each GRES allocated on each
node to any job

slurmd configured.

Original code worked only for Cray systems. For other systems it
set gres_alloc to the total number of each GRES allocated on each
node to any job

Conflicts:
	doc/html/news.shtml

Logs errors related to apbasil use

No change in logic, just move the logic that resets a batch job
accounting information into its own function.

No change in underlying logic

This fixes a problem where a job contains a license that is removed
in a slurmctld reconfiguration. Without this change, the job would
be left with a non-zero license_list pointer referencing memory that
had been freed
bug 527