[579025] resetLUSSIDs per-convert
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/Ecore2AS.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/Ecore2AS.java
index a9e6d0d..7640c77 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/Ecore2AS.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/Ecore2AS.java
@@ -1154,7 +1154,9 @@
 		return String.valueOf(ecoreResource.getURI());
 	}
 
-	public void update(@NonNull Resource asResource, @NonNull Collection<@NonNull EObject> ecoreContents) {
+	public void update(@NonNull Resource resource, @NonNull Collection<@NonNull EObject> ecoreContents) {
+		ASResource asResource = (ASResource)resource;		// FIXME change signature
+		asResource.resetLUSSIDs();			// Hopefully reset already, not wanted till save. See Bug 579052.
 		allConverters.clear();
 		newCreateMap = new HashMap<>();
 		referencers = new HashSet<>();
@@ -1192,6 +1194,6 @@
 		 */
 		resolveReferences();
 		resolveIds(ecoreContents);
-		assert ((ASResource)asResource).basicGetLUSSIDs() == null;			// Confirming Bug 579025
+		assert asResource.basicGetLUSSIDs() == null;			// Confirming Bug 579025
 	}
 }
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/LUSSIDs.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/LUSSIDs.java
index c4150b4..880deb6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/LUSSIDs.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/LUSSIDs.java
@@ -36,7 +36,8 @@
  * of an ASResource. It also provides the ability to return predictable xmi:id values.
  *
  * An xmi:id is provided for every explicitly referenced, and every potentially externally referenced element,
- * so that the EMF fall-back to @x/@y.1 style id references is never required.
+ * so that the EMF fall-back to @x/@y.1 style id references is never required in a persisted resource. However
+ * for casual use such as by Diagnostician.getObjectLabel the conventional URI is used.
  *
  * The xmi:id typically comprises a 5 Base64-like letter encoding of the bottom 30 bits of the LUSSID of the element.
  * Additional Base64 letters are occasionally needed to disambiguate duplicates. Disambiguation favours the externally
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/CS2ASConversion.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/CS2ASConversion.java
index afef7b6..543a656 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/CS2ASConversion.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/CS2ASConversion.java
@@ -1381,7 +1381,7 @@
 		ASResource asResource = converter.csi2asMapping.getASResource(csResource);
 		boolean wasUpdating = false;
 		if (asResource != null) {
-			wasUpdating = asResource.setUpdating(true);
+			asResource.resetLUSSIDs();			// Hopefully reset already, not wanted till save. See Bug 579052.
 			for (EObject eObject : asResource.getContents()) {
 				if (eObject instanceof Model) {
 					List<org.eclipse.ocl.pivot.Package> nestedPackage = ((Model)eObject).getOwnedPackages();