Merge branch '2.3.x' into 2.4.x

crss-admin/crss-admin.yml

@@ -18,7 +18,7 @@ spring:
   # TODO: UPDATE configs for prod
   mail:
     subject:
-      prefix: "[CRSS 2.0 - Trial Operation]"
+      prefix: "[CRSS 2.0]"
     # Set to local mailserver for testing. Pleaase unset after.
     host: 192.168.10.96
     port: 25