Merge branch 'main' into 63-specify-db-name

Author: rs-fraser

DevDocs/DeveloperNotes/GettingStarted/GettingStarted.md

@@ -261,6 +261,7 @@ alters the logging verbosity for various frameworks or RSpace code.
 
 #### Set deployment properties through command line
 
+<<<<<<< HEAD
 `-Djdbc.url=jdbc:mysql://localhost:3306/another_database -Djdbc.db=another_database -Djdbc.db.maven=another_database`
 specifies to use a different database `another_database` at the url `jdbc:mysql://localhost:3306/another_database`.