Merge remote-tracking branch 'origin/slurm-2.6'

Conflicts:
	src/common/read_config.c
	src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
	src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
	src/slurmctld/job_mgr.c