Conflicts:
	src/common/slurm_protocol_defs.c

Rather than the numeric value

If a numeric value is not found in the function's table, print that
number rather than UNKNOWN.

On slurmdbd error, print the message type by name rather than number.

In rpc_num2string(), if the message type number is not known, then
print its numeric value rather than "UNKNOWN_PROTOCOL_MESSAGE".

to JOB_PENDING and preserve the flags.

Update FSF address

No functional changes, just updating the last couple of files
with the old FSF address in the comment.

won't appear before Cray's libpmi in the linker cache.

This means we can now include the Slurm libpmi on Cray systems
 - this is needed for some third-party MPIs.

For "scontrol --details show job" report the correct CPU_IDs when thre are
multiple threads per core (we are translating a core bitmap to CPU IDs).
This is an enhancement of commit 83d626ca
so the node table is only loaded once for the entire job table.
bug 850

Correct the record of CPU_IDs allocated to a job if there is more
than one CPU per core.

If job requests --exclusive then do not use nodes which have any cores in an
advanced reservation. Also prevents case where nodes can be shared by other
jobs.

Disable some logging that would be very slow unless
the _DEBUG flag is set in the plugin

If job requests --exclusive then do not use nodes which have any cores in an
advanced reservation. Previously the job would be allocated all of the cores
outside of the advanced reservation.

Correct support for partition with Shared=YES configuration.
Previous logic would share resources for jobs by default
(i.e. if user did not explicitly request --exclusive).
bug 758

This reording of some code results in cleaner logic

collapse the scheduling table when possible to reduce the
number of time slots to check for pending jobs. This should
improve performance considerably.

Previous logic was sometimes building incomplete map

When a decision is made to start a job, if for some
reason that job's start failed, the backfill scheduler
would previously just exit. With this change, it logs
the event and reserves the resources expected to be
used and continues down the job queue.

This change prevents creation of some back-to-back records with
the same resources, but different times.

No change in logic

Improved logging of backfill scheduling actions
Better handling of backfill_resolution logic to avoid creating
   some records that are not needed
Avoid creating some backfill scheduling maps with zero duration
The net effect should be slightly improved performance with no
   significant difference in action