Merge "Fix interface naming in mitaka-ovs-trusty model"