resolved merge conflicts
fixed C-ARES external build CMakeLists.txt
Merge pull request #1 from reneme/query_dns_resolve_conflicts

Resolved merge conflicts