Merge "Add a default setting for BondInterfaceOvsOptions"