feat #4138 Fix rebase bug and update docs

Author: joemull

docs/md/task-and-email-logs.md

@@ -21,8 +21,6 @@ TODO
 
 -->
 
-## Exceptions to action logging
+## Non-workflow log entries
 
-There are exceptions to logging that are worth noting:
-
-- Contact messages are not logged. Instead they are simply stored as objects.
+There are email messages stored as log entries that are unrelated to the workflow. Contact messages are the first case of this kind of non-workflow log entry.

src/utils/install/journal_defaults.json

@@ -5648,7 +5648,6 @@
         },
         "value": {
             "default": "Contact message received"
->>>>>>> cd29e3a87 (feat #4138 Upgrade and refactor contact system)
         },
         "editable_by": [
             "editor",