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

# Conflicts:
#	src/plugins/launch/aprun/Makefile.in
#	src/plugins/proctrack/sgi_job/Makefile.in
#	src/plugins/select/alps/Makefile.in
#	src/plugins/select/alps/libalps/Makefile.in
#	src/plugins/select/alps/libemulate/Makefile.in
#	src/plugins/select/cons_tres/Makefile.in
#	src/sprio/Makefile.in