Merge pull request #19320 from jow-/miniupnpd-rework