Merge "Fix opencontrail/meta/*.yml for the CI"