Merge "Network OVS: ovs ports must be in an ovs bridge config" into release/2019.2.0