Merge branch '0.5.x' into 0.5.x-payload

Author: NiteshKant

reactivesocket-core/build.gradle

@@ -39,7 +39,5 @@ jmh {
 dependencies {
     compile project(':reactivesocket-publishers')
 
-    testCompile project(':reactivesocket-test')
-
     jmh group: 'org.openjdk.jmh', name: 'jmh-generator-annprocess', version: '1.15'
 }

reactivesocket-core/src/main/java/io/reactivesocket/ClientReactiveSocket.java

@@ -159,7 +159,7 @@ private Publisher<Payload> handleStreamResponse(Px<Payload> request, FrameType r
             int streamId = nextStreamId();
             RemoteSender sender = new RemoteSender(request.map(payload -> Frame.Request.from(streamId, requestType,
                                                                                              payload, 1)),
-                                                   removeSenderLambda(streamId), 1);
+                                                   removeSenderLambda(streamId), streamId, 1);
             Publisher<Frame> src = s -> {
                 CancellableSubscriber<Void> sendSub = doOnError(throwable -> {
                     s.onError(throwable);