modified to fix the opencontrail bundle issue for nonha.