Merge "Fixed contrail key in cookiecutter pipeline"