Merge branch 'slurm-2.3'

Conflicts:
	Makefile.in
	auxdir/Makefile.in
	configure
	contribs/Makefile.in
	contribs/arrayrun/Makefile.in
	contribs/cray/Makefile.in
	contribs/lua/Makefile.in
	contribs/pam/Makefile.in
	contribs/perlapi/Makefile.in
	contribs/perlapi/libslurm/Makefile.in
	contribs/perlapi/libslurmdb/Makefile.in
	contribs/phpext/Makefile.in
	contribs/sjobexit/Makefile.in
	contribs/slurmdb-direct/Makefile.in
	contribs/torque/Makefile.in
	doc/Makefile.in
	doc/html/Makefile.in
	doc/man/Makefile.in
	etc/init.d.slurm
	src/Makefile.in
	src/api/Makefile.in
	src/common/Makefile.in
	src/database/Makefile.in
	src/db_api/Makefile.in
	src/plugins/Makefile.in
	src/plugins/accounting_storage/Makefile.in
	src/plugins/accounting_storage/common/Makefile.in
	src/plugins/accounting_storage/filetxt/Makefile.in
	src/plugins/accounting_storage/mysql/Makefile.in
	src/plugins/accounting_storage/none/Makefile.in
	src/plugins/accounting_storage/pgsql/Makefile.in
	src/plugins/accounting_storage/slurmdbd/Makefile.in
	src/plu...