Merge pull request #15878 from brahmaroutu/vendor_netns

Allow vendoring netns changes to build Docker on s390x