Merge pull request #3558 from rolfbjarne/tests-system-dns-make-failures-not-crash-app