Contrail

fixed application of nova_v3.patch