Merge "Add STACK_CLUSTER_NAME to cluster-dply template"