Conflicts:
	META
	NEWS

If checkpoint/blcr is configured. only log that scch is not found
using debug() rather than info(). Add documentation about the file.

Disable use of SQUEUE_FORMAT env var if squeue -l, -o, or -s option is
used. Patch from Aaron Knister (UMBC).

so you don't have update your slurmctlds to have the problem go away.
This fix makes it so you only have to update your slurmdbd.

association/wckey to be set incorrectly as a default the new object
was added after an original default object already existed.  Before
the slurmctld would need to be restarted to fix the issue.

Add hotel, contact and directions to SLURM User Group Meeting info

Trivial style fixes

BLUEGENE - added start_loc to the jobinfo structure to handle things in a Q system handling sub block jobs

Fixed printf format strings in cases where the node count (an unsigned int) was being treated as an unsigned short.

Format string was expecting a short and promoting it to an unsigned int, but the input was an unsigned int to begin with.

Modify sview's full display for a job step to show the individual cnodes
allocated to a step on a BGQ system.

Remove the block_len argument to the function ba_geo_test_all()
and use the geometry information passed into the function for
equivalent information

Major re-write of the algorithm used to allocate N-dimensional
objects using bitmaps: Added argument that controls whether
passthroughs can be used in each specific dimension. Added
coordinates of starting location of block in each dimension.
Added element count (geometry) in each dimension. Added offset
so that scan can be continued and generated alternative placements
without re-testing placements already tested.