Merge "Fix Contrail 4.0 xenial interface name"