Merge "Enable OpenVSwitch alerts only when using OVS." into release/2019.2.0