Conflicts: META NEWS src/common/parse_time.c src/plugins/gres/mic/gres_mic.c src/slurmd/slurmd/slurmd.c testsuite/expect/test1.84