Merge "Don't redirect dns to an iface without dns servers" into klp-dev