Replaced underscores with hyphens in cluster names and domains

Change-Id: I90d163602a0915b23f25f9f4d799799c0336e664
16 files changed