Merge pull request #2801 from elfiesmelfie/fix_ovs_clang