Merge remote-tracking branch 'origin/nrt'

Conflicts:
	Makefile.in
	aclocal.m4
	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
	doc/man/man1/Makefile.in
	doc/man/man3/Makefile.in
	doc/man/man5/Makefile.in
	doc/man/man8/Makefile.in
	src/Makefile.in
	src/api/Makefile.in
	src/common/Makefile.in
	src/common/switch.c
	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_...