Conflicts:
	src/plugins/burst_buffer/cray/burst_buffer_cray.c