cleaning up component diffs a bit: correctly learning remote realm/cluster names