✂️ Move upsert operation between insert and update to be more consistent

Author: jonathanwiesel

sfdx-source/apex-common/main/classes/fflib_SObjectUnitOfWork.cls

@@ -701,9 +701,9 @@ public virtual class fflib_SObjectUnitOfWork
 		onPublishBeforeEventsFinished();
 
 		onDMLStarting();
-		insertDmlByType();
-		updateDmlByType();
+        insertDmlByType();
         upsertDmlByType();
+		updateDmlByType();
 		deleteDmlByType();
 		emptyRecycleBinByType();
 		resolveEmailRelationships();