Merge "Skip nameserver propagation tests when no NS's in conf"