Error on -a and -p being specified on the same line.
Bug 1201

This reverts commit eb752cdc.

Conflicts:
	src/sinfo/sinfo.c

sinfo -a also overrides sinfo -p.
Bug 1201

We have sufficient infrastructure in place to work with now

Conflicts:
	META
	NEWS

Conflicts:
	META

Bug 1220

Remove BurstBufferParameters from slurm.conf
Create new burst_buffer.conf config file

This was an unrealized regression from commit 0da01963.  The problem
is we were clearing the job_ptr->job_resrcs too early.  This patch fixes
it to wait until the job is actually being requeued so it does the right
thing.

not running.

MB, GB, TB, PB, or N (for nodes).
Also added a BB_SIZE_IN_NODES flag to slurm.conf

The logic was flawed to preserve BurstBufferType on slurmctld reconfig
In addition for many plugins, one could go from no value to some
value (i.e. a change in plugin) without reconfiguring. In this case,
the slurmctld logic would not match what is in slurm.conf or reported
by "scontrol show config".