Merge "Change OpenStack clean behaviour"