Merge branch 'bull_power'

Makefile.am

Makefile.in

configure

configure.ac

contribs/perlapi/libslurm/perl/conf.c

doc/man/man1/scontrol.1

etc/layouts.d.power.conf.example

slurm.spec

slurm/slurm.h.in

slurm/slurm_errno.h

src/api/Makefile.am

src/api/Makefile.in

src/api/init_msg.c

src/api/powercap_info.c

src/api/reservation_info.c

src/api/step_ctx.c

src/api/update_config.c

src/common/slurm_errno.c

src/common/slurm_protocol_api.c

src/common/slurm_protocol_api.h