Minimize differences between gold/slurm.

Change-Id: Ic9a5252778ad664b22269199fad073c49a0cfe14