Fixes for publishing with fixtures

Changes to be committed:
	modified:   api/model/prefix.py
	modified:   api/scripts/utilities/DbUtils.py

api/model/prefix.py

@@ -723,7 +723,9 @@ def create_counter_for_prefix(sender, instance=None, created=False, **kwargs):
         instance: api.model.prefix.Prefix
         created: bool
     """
-    if not 'test' in sys.argv:
+    if 'test' in sys.argv or 'loaddata' in sys.argv or 'flush' in sys.argv:
+            return
+    else:
         if created:
             prefix_table.objects.create(n_objects=1, prefix=instance.prefix)
 

api/scripts/utilities/DbUtils.py

@@ -731,7 +731,10 @@ def messages(self, parameters, p_content=False):
                 "status_code": "409",
                 "message": "The provided object "
                 + parameters["object_id"]
-                + " has already been created on this server.",
+                + " has already been created on this server."
+                + " If you wish to publish a new version of this BCO try"
+                + " to save the DRAFT with a different version number, and"
+                + " then resubmit.",
             },
             "409_draft_object_id_conflict": {
                 "request_status": "FAILURE",