Merge changes I47ccfa99,I5db1de3e

* changes:
  Extract DNS setting logic into DnsManager class
  Add minimal test for setting DNS properties