Merge "Fix typo in opencontrail 5 branches"