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

Change-Id: Ide70e9770250badc87b1d4230939bf6a3c198c5b