Sync with cookbooks/openvswitch