Substitute _ in cluster domain

Change-Id: I1a5776bc0545efd2e5551297bccd1b1d6a1d65b6
4 files changed