Fix issue when changing a users name in accounting, if using wckeys would execute correctly, but bad memcopy would core the DBD.  No information would be lost or corrupted, but you would need to restart the DBD.

    --mem-per-cpu options on a heterogeneous cluster. Patch from Bjorn-Helge
    Mevik, University of Oslo.

Conflicts:
	src/plugins/select/bluegene/ba_common.c
	src/plugins/select/bluegene/ba_common.h

in the resource allocations in any dimension. Also change the 4D to 1D bitmaps so that
position 1,0,0,0 has bit 1 instead of position 0,0,0,1 (for consistency with the
other node bitmaps).

The `.rst` extension stands for reStructuredText, one of the markup formats
supported by github.  The tool they use to render your `README.*` and the list
of markup languages it supports can be found here:
    https://github.com/github/markup

reverted more of the change from Gerrit since the last revert made functions that aren't used anymore.

This continues the conversion of the cont_id from 32bit to 64bit,
 * updated slurm_container_find() to return u64 in order to match type of container ID;
 * updated slurm_proctrack_ops() to match the update of u32 -> u64 container ID in the
   slurm_container_xxx() functions,
 * miscellaneous type conversions from/to u64,
 * using "%"PRIu64"" for printing 64 bit.
Patch 01_proctrack-64-bit-conversion.diff from Gerrit Renker

Minor mods to man page html generation

Reverted back the change in get_basil_version, and made it a static var, only compile checked so far.

    scripts.

    command. Dependent upon .rpmmacros parameter of "%_with_srun2aprun"

Just use whichever StorageType plugin the user specifies to the configurator

Patch from Bill Brophy

    --cpus-per-task option. Patch from Martin Perry, Bull.