Merge "Replaced underscores with hyphens in cluster names and domains"