Merge "Add mdns files and unit tests"