Resolved merge conflicts

Hi Weijen,

I've just taken a look at your merge! Thanks.
Somehow you missed some merge conflict flags in 3 different files. I hope I fixed the conflicts in the right way.

Furthermore this branch does not compile on my machine. It complains, that it does not find ares.h when compiling querydns.cc for the cvmfs2 executable. You might need to fix the CMakeLists.txt file in order to set the right include pathes.

Best Regards,
René