modified cleanup for the OVS for 3.2.1 and 4.0

Accept with https://mirantis.jira.com/browse/OSCI-779 completion. Please also mind of backporting upstart diff to the 3.2.1 and to the Grizzly.