Backport sd race network#1809

fcrisciani wants to merge 2 commits intomoby:release/v0.9moby/libnetwork:release/v0.9from

fcrisciani:backport-sd-race-networkfcrisciani/libnetwork:backport-sd-race-networkCopy head branch name to clipboard