Sync release branch of cookiecutter-templates

Change-Id: I575a8b1a5eb19a5ec3e70883450bf0cffe8d9007
See: https://mirantis.jira.com/browse/PROD-22707
1 file changed