Discovery needs to default realm to realm_name instead of cluster_name if it's available

Change-Id: I4184b46edc743ab6a053e05167965009c60642d9
Merge "Discovery needs to default realm to realm_name instead of cluster_name if it's available" into rc