Merge branch 'feature-network-parameters' into shams-merge-feature-network-parameters

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

@@ -10,10 +10,6 @@ dataSourceProperties : {
 p2pAddress : "my-corda-node:10002"
 rpcAddress : "my-corda-node:10003"
 webAddress : "localhost:10004"
-networkMapService : {
-    address : "my-network-map:10000"
-    legalName : "O=Network Map Service,OU=corda,L=London,C=GB"
-}
 useHTTPS : false
 rpcUsers : [
     { username=user1, password=letmein, permissions=[ StartProtocol.net.corda.protocols.CashProtocol ] }