Merge "Fix create_env_jenkins_cicd"