Conflicts:
	NEWS
	src/plugins/burst_buffer/cray/burst_buffer_cray.c
	src/plugins/burst_buffer/generic/burst_buffer_generic.c