Merge "Fix ovsdb sonar configuration"