Merge "Add initial framework for DNS service discovery"