svn merge -r13237:13250 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

src/plugins/sched/wiki2/get_nodes.c

...plugins/select/bluegene/block_allocator/block_allocator.h

src/plugins/select/bluegene/plugin/bg_job_place.c

src/plugins/select/bluegene/plugin/dynamic_block.c

src/smap/configure_functions.c