Conflicts:
	src/sacct/print.c

The 2 came from the nodelist being "None assigned", which would be treated
as 2 hosts when sent into hostlist.

the default qos for the association.

jobs.

Bug 1969

Pending job array records will be combined into single line by default,
    even if started and requeued or modified.
bug 1759

diversion.

bug 1874

bug 1967

If user belongs to a group which has split entries in /etc/group
    search for its username in all groups.
Ammendment to commit 93ead71a
bug 1738

The file is not installed, but this should eliminate any possible
  confusion in its use.

If GRES are associated with specific CPUs and a job allocation includes
GRES, which are not associated with the specific CPUs allocated to the
job, then when the job is deallocated, an underflow error results. To
reproduce:

gres.conf:
Name=gpu File=/dev/tty0 CPUs=0-5
Name=gpu File=/dev/tty1 CPUs=6-11
Name=gpu File=/dev/tty2 CPUs=12-17
Name=gpu File=/dev/tty3 CPUs=18-23

Then
$ srun --gres=gpu:2 -N1 --ntasks-per-node=2 hostname

In slurmctld log file:
error: gres/gpu: job 695 dealloc node smd1 topo gres count underflow

Logic modified to increment the count based upon the specific GRES
actually allocated, ignoring the associated CPUs (too late to consider
that after the GRES as picked).

Conflicts:
	NEWS
	src/slurmctld/acct_policy.c

Also a very minor sanity check in job_mgr.c to make sure we at least have
a task count.  This shouldn't matter, but just to be as robust as possible.

only 1 job was accounted (against MaxSubmitJob) for when an array was
submitted.

Correct counting for job array limits, job count limit underflow possible
    when master cancellation of master job record.
bug 1952

Bug 1905

Sort output of "scontrol show license" in alphabetic order and
 add test of that capability