minor change to make the D2 log easier to grep and D2 test to be less flaky

RB=196008
a=dhoa