Merge "Add tests for servers with broken EDNS handling"