contrail specific patch for contrail/icehouse nova branch