Merge "Use container image tags for OpenContrail"