Merge "Use (or set properly) system-id generated by openvswitch"