Merge "Set docker image tag for OpenContrail in defaults"