Restore ENT-only logic clobbered in merge

node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt

@@ -173,6 +173,8 @@ class NodeVaultService(
                         notary = stateAndRef.value.state.notary,
                         contractStateClassName = stateAndRef.value.state.data.javaClass.name,
                         stateStatus = Vault.StateStatus.UNCONSUMED,
+                        lockId = uuid,
+                        lockUpdateTime = if (uuid == null) null else now,
                         recordedTime = clock.instant(),
                         isRelevant = if (isRelevant) Vault.RelevancyStatus.RELEVANT else Vault.RelevancyStatus.NOT_RELEVANT
                 )

node/src/test/kotlin/net/corda/node/services/vault/VaultSoftLockManagerTest.kt

@@ -1,13 +1,3 @@
-/*
- * R3 Proprietary and Confidential
- *
- * Copyright (c) 2018 R3 Limited.  All rights reserved.
- *
- * The intellectual and technical concepts contained herein are proprietary to R3 and its suppliers and are protected by trade secret law.
- *
- * Distribution of this file or any portion thereof via any medium without the express permission of R3 is strictly prohibited.
- */
-
 package net.corda.node.services.vault
 
 import co.paralleluniverse.fibers.Suspendable