Merge "fix OpenContrail 4.0 metadata"