Merge "Add OpenFlow ID to ovsdb-bridge-attributes."