Reverting ElementId hashCode + equals logic, which was breaking TopologyManagerTest

- requires further investigation later

Change-Id: I22de937c1ffdd60f674813e5e5dd10b0ddce524b

@@ -38,7 +38,7 @@ public abstract class ElementId {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(str);
+        return Objects.hash(uri);
     }
     }
 
 
     @Override
     @Override
@@ -49,7 +49,7 @@ public abstract class ElementId {
         if (obj instanceof ElementId) {
         if (obj instanceof ElementId) {
             final ElementId that = (ElementId) obj;
             final ElementId that = (ElementId) obj;
             return this.getClass() == that.getClass() &&
             return this.getClass() == that.getClass() &&
-                    Objects.equals(this.str, that.str);
+                    Objects.equals(this.uri, that.uri);
         }
         }
         return false;
         return false;
     }
     }