Allows DemoBench profile files to utilize extra database settings (#2310)

Pass-through for supporting external DB properites in .profile files

tools/demobench/README.md

@@ -110,6 +110,9 @@ Now choose `File/Open` from the main menu, and select the profile that you have
 just saved. DemoBench should close the two existing tabs and then relaunch the
 Notary and Bank nodes.
 
+If you want to edit the content, please make sure that when zipping content back, 
+the notary node is the first directory (ZIP files content is ordered) 
+
 ## Exiting DemoBench
 
 Close DemoBench as a normal application on your platform; it should close any

tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeConfig.kt

@@ -13,6 +13,7 @@ import net.corda.nodeapi.internal.config.User
 import net.corda.nodeapi.internal.config.toConfig
 import java.nio.file.Path
 import java.nio.file.StandardCopyOption
+import java.util.Properties
 
 /**
  * This is a subset of FullNodeConfiguration, containing only those configs which we need. The node uses reference.conf
@@ -29,7 +30,10 @@ data class NodeConfig(
         val h2port: Int,
         val rpcUsers: List<User> = listOf(defaultUser),
         /** This is an extra config used by the Cash app. */
-        val issuableCurrencies: List<String> = emptyList()
+        val issuableCurrencies: List<String> = emptyList(),
+        /** Pass-through for generating node.conf with external DB */
+        val dataSourceProperties: Properties? = null,
+        val database: Properties? = null
 ) {
     companion object {
         val renderOptions: ConfigRenderOptions = ConfigRenderOptions.defaults().setOriginComments(false)