fixing merge issue causing nova-compute crash with contrail juno build, this is need for juno's nova build

Change-Id: I27273f532f795200aef566d5c131ee89f9a35cb1