Merge "Revert "Add config to use lower of IPv4/IPv6 MTU values""