Merge pull request #16237 from stintel/ovs-libunbound-fix