contrail specific patch for contrail/icehouse nova branch

will change it as a separate commit..