Conflicts: src/plugins/burst_buffer/cray/burst_buffer_cray.c src/plugins/select/cons_res/select_cons_res.c