Merge "Changes required for custom resolv conf file in contrail 4.x"