Merge remote-tracking branch 'remotes/open/master' into merges/march-19-14-41

# Conflicts:
#	client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
#	node/src/main/java/CordaCaplet.java
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt

core/src/main/kotlin/net/corda/core/messaging/CordaRPCOps.kt

@@ -31,6 +31,7 @@ import net.corda.core.serialization.CordaSerializable
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.utilities.Try
 import rx.Observable
+import rx.subjects.PublishSubject
 import java.io.IOException
 import java.io.InputStream
 import java.security.PublicKey
@@ -382,6 +383,44 @@ interface CordaRPCOps : RPCOps {
      * @see setFlowsDrainingModeEnabled
      */
     fun isFlowsDrainingModeEnabled(): Boolean
+
+    /**
+     * Shuts the node down. Returns immediately.
+     * This does not wait for flows to be completed.
+     */
+    fun shutdown()
+}
+
+/**
+ * Returns a [DataFeed] that keeps track on the count of pending flows.
+ */
+fun CordaRPCOps.pendingFlowsCount(): DataFeed<Int, Pair<Int, Int>> {
+
+    val stateMachineState = stateMachinesFeed()
+    var pendingFlowsCount = stateMachineState.snapshot.size
+    var completedFlowsCount = 0
+    val updates = PublishSubject.create<Pair<Int, Int>>()
+    stateMachineState
+            .updates
+            .doOnNext { update ->
+                when (update) {
+                    is StateMachineUpdate.Added -> {
+                        pendingFlowsCount++
+                        updates.onNext(completedFlowsCount to pendingFlowsCount)
+                    }
+                    is StateMachineUpdate.Removed -> {
+                        completedFlowsCount++
+                        updates.onNext(completedFlowsCount to pendingFlowsCount)
+                        if (completedFlowsCount == pendingFlowsCount) {
+                            updates.onCompleted()
+                        }
+                    }
+                }
+            }.subscribe()
+    if (completedFlowsCount == 0) {
+        updates.onCompleted()
+    }
+    return DataFeed(pendingFlowsCount, updates)
 }
 
 inline fun <reified T : ContractState> CordaRPCOps.vaultQueryBy(criteria: QueryCriteria = QueryCriteria.VaultQueryCriteria(),

core/src/test/kotlin/net/corda/core/flows/ContractUpgradeFlowTest.kt

@@ -126,7 +126,7 @@ class ContractUpgradeFlowTest {
         return startRpcClient<CordaRPCOps>(
                 rpcAddress = startRpcServer(
                         rpcUser = user,
-                        ops = SecureCordaRPCOps(node.services, node.smm, node.database, node.services)
+                        ops = SecureCordaRPCOps(node.services, node.smm, node.database, node.services, { })
                 ).get().broker.hostAndPort!!,
                 username = user.username,
                 password = user.password