Porting https://github.com/docker/docker/pull/12437#178

mrjana merged 1 commit intomoby:mastermoby/libnetwork:masterfrom

mavenugo:mastermavenugo/libnetwork:masterCopy head branch name to clipboard