Merge pull request #218 from detiber/fixRecursionEnt

disable recursion for dns
update resolv.conf template

add values of conf_nameserver_upstream_dns to resolv.conf