Disable non-dhcp resolv.conf

Fixes: bug #1119268
Change-Id: Icf7d420a31eb7a0cb46b2e59a4328f6b640deb57
Merge "Disable non-dhcp resolv.conf"