Conflicts:
	src/common/Makefile.am
	src/common/Makefile.in
	src/plugins/proctrack/cgroup/proctrack_cgroup.c

Enable CUDA v7.0+ use with a Slurm configuration of TaskPlugin=task/cgroup
ConstrainDevices=yes (in cgroup.conf). With that configuration
CUDA_VISIBLE_DEVICES will start at 0 rather than the device number.
bug 1421

Move the functions that read cgroup.conf from src/slurmd/common
to slurmd/common so that the gres/gpu plugin can use it.

debug2 instead of info.

SLURM_JOB_PARTITION to be the one in which the job started.

correct variables.

Conflicts:
	doc/html/reservations.shtml
	src/plugins/accounting_storage/mysql/as_mysql_jobacct_process.c

Bug 1407
Continuation of da8409c0

If using proctrack/cgroup and gres/gpu, always start CUDA_VISIBLE_DEVICES
environment variable numbering at 0.
bug 1421

reservations.

This is an add on to commit 2e5142ef.  Servicing Bug 1418.

the partition in which the job runs.

This reverts commit c18a3c72.

Front End systems.

initially been added.

Use full state names rather than abbreviated form in reporting possible values
bug 1413

Code is ready to begin testing on Cray system

to stepds when processing fencing.

Conflicts:
	src/slurmctld/job_scheduler.c
	src/slurmd/slurmd/req.c

Add logic to get current joule counters using capmc
Keep the plugin active with a configuration of "cap_watts=0" and
  clear any node's power caps as needed.
Some documentation updates

Change default PowerPlugin from "power/none" to "" (load NO plugin).
Comment out job-centric power logic
Add timers
Improve handling of incomplete power data