Merge pull request #17548 from mavenugo/ugr

Vendoring libnetwork to fix #17526 & #17527