This slows down initial convergence, but avoids a broadcast burst
at boot.  Thanks to Teco Boot for pointing this out.

(cherry picked from commit b66c1733)