am 22c1871d: Merge "DO NOT MERGE - remove dns test from MR2" into jb-mr2-dev

* commit '22c1871d8856ea30bc8258759a7fea0538531e41':
  DO NOT MERGE - remove dns test from MR2