contrail specific patch for contrail/icehouse nova branch

This change seems unrelated.