Merge pull request #16152 from BKPepe/miniupnpnd-remove-not-upstreamed-patch