Merge pull request #2590 from maryamtahhan/fix_collectd_ovs_deadlock