Merge "Add configuration to support OVS kernel module"