Merge "DO NOT MERGE - remove dns test from MR2" into jb-mr2-dev