Merge remote-tracking branch 'open/master' into os-merge-2792716

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

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

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

@@ -18,4 +18,3 @@ rpcUsers : [
     { username=user1, password=letmein, permissions=[ StartFlow.net.corda.protocols.CashProtocol ] }
 ]
 devMode : true
-// certificateSigningService : "https://testnet.certificate.corda.net"

docs/source/example-code/src/test/kotlin/net/corda/docs/ExampleConfigTest.kt

@@ -39,8 +39,7 @@ class ExampleConfigTest {
     fun `example node_confs parses fine`() {
         readAndCheckConfigurations<NodeConfiguration>(
                 "example-node.conf",
-                "example-out-of-process-verifier-node.conf",
-                "example-network-map-node.conf"
+                "example-out-of-process-verifier-node.conf"
         ) {
             val baseDirectory = Paths.get("some-example-base-dir")
             ConfigHelper.loadConfig(