Merge remote-tracking branch 'remotes/open/master' into merges/march-1-15-20

# Conflicts:
#	docs/source/corda-configuration-file.rst
#	docs/source/release-notes.rst
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt
#	tools/explorer/README.md
#	tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt

docs/source/example-code/src/main/resources/example-network-map-node.conf

@@ -1,6 +1,4 @@
 myLegalName : "O=Notary Service,OU=corda,L=London,C=GB"
 keyStorePassword : "cordacadevpass"
 trustStorePassword : "trustpass"
-p2pAddress : "my-network-map:10000"
-webAddress : "localhost:10001"
-sshdAddress : "localhost:10002"
+p2pAddress : "my-network-map:10000"

docs/source/example-code/src/main/resources/example-node.conf

@@ -14,7 +14,6 @@ rpcSettings = {
     address : "my-corda-node:10003"
     adminAddress : "my-corda-node:10004"
 }
-webAddress : "localhost:10004"
 rpcUsers : [
     { username=user1, password=letmein, permissions=[ StartFlow.net.corda.protocols.CashProtocol ] }
 ]

docs/source/example-code/src/main/resources/example-out-of-process-verifier-node.conf

@@ -1,4 +1,3 @@
 myLegalName : "O=Bank A,L=London,C=GB"
 p2pAddress : "my-corda-node:10002"
-webAddress : "localhost:10003"
 verifierType: "OutOfProcess"