Merge remote-tracking branch 'corda/master' into christians_os_merge_20171031

node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/Schema.kt

@@ -17,16 +17,6 @@ import java.util.*
 import net.corda.nodeapi.internal.serialization.carpenter.Field as CarpenterField
 import net.corda.nodeapi.internal.serialization.carpenter.Schema as CarpenterSchema
 
-/**
- * R3 AMQP assigned enterprise number
- *
- * see [here](https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers)
- *
- * Repeated here for brevity:
- *   50530 - R3 - Mike Hearn - mike&r3.com
- */
-const val DESCRIPTOR_TOP_32BITS: Long = 0xc5620000
-
 const val DESCRIPTOR_DOMAIN: String = "net.corda"
 
 // "corda" + majorVersionByte + minorVersionMSB + minorVersionLSB

node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/EvolvabilityTests.kt

@@ -79,7 +79,6 @@ class EvolvabilityTests {
         // Original version of the class as it was serialised
         // data class C(val a: Int)
         // File(URI("$localPath/$resource")).writeBytes( SerializationOutput(sf).serialize(C(A))
-        .bytes)
 
         data class C(val a: Int, val b: Int?)