Protect D2 from intermittent zookeeper problem.

RB=190153
a=dhoa