Merge "Update OpenVSwitch schema to include new datapath and port types."