post back port build fixes, renamed PainlessScript property on tests because it still uses Groovy in 2.x

Author: Mpdreamz

src/Elasticsearch.Net/Transport/Pipeline/ResponseBuilder.cs

@@ -9,9 +9,9 @@ public class ResponseBuilder<TReturn>
 	{
 		private const int BufferSize = 81920;
 		private static readonly VoidResponse Void = new VoidResponse();
-		private static readonly IDisposable EmptyDisposable = new MemoryStream();
-
-		private readonly RequestData _requestData;
+		private static readonly IDisposable EmptyDisposable = new MemoryStream();
+
+		private readonly RequestData _requestData;
 		private readonly bool _disableDirectStreaming;
 
 		public Exception Exception { get; set; }
@@ -75,7 +75,7 @@ private void SetBody(ElasticsearchResponse<TReturn> response, Stream stream)
 						if (this._requestData.CustomConverter != null) response.Body = this._requestData.CustomConverter(response, stream) as TReturn;
 						else response.Body = this._requestData.ConnectionSettings.Serializer.Deserialize<TReturn>(stream);
 					}
-					if (response.AllowAllStatusCodes) 
+					if (response.AllowAllStatusCodes)
 						ReadServerError(response, new MemoryStream(bytes), bytes);
 				}
 				else if (response.HttpStatusCode != null)
@@ -122,7 +122,7 @@ private void ReadServerError(ElasticsearchResponse<TReturn> response, Stream str
 
 		private async Task ReadServerErrorAsync(ElasticsearchResponse<TReturn> response, Stream stream, byte[] bytes)
 		{
-			response.ServerError = await ServerError.TryCreateAsync(stream, this._cancellationToken).ConfigureAwait(false);
+			response.ServerError = await ServerError.TryCreateAsync(stream, this._requestData.CancellationToken).ConfigureAwait(false);
 			if (_disableDirectStreaming)
 				response.ResponseBodyInBytes = bytes;
 		}

src/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerApiTests.cs

@@ -48,7 +48,7 @@ protected override LazyResponses ClientUsage() => Calls(
 
 		protected override bool SupportsDeserialization => false;
 
-		protected virtual string PainlessScript { get; } = "if (ctx._source.flag == 'bar') {ctx._source.remove('flag')}";
+		protected virtual string GroovyScript { get; } = "if (ctx._source.flag == 'bar') {ctx._source.remove('flag')}";
 
 		protected override Func<ReindexOnServerDescriptor, IReindexOnServerRequest> Fluent => d => d
 			.Source(s=>s
@@ -72,7 +72,7 @@ protected override LazyResponses ClientUsage() => Calls(
 				.VersionType(VersionType.Internal)
 				.Routing(ReindexRouting.Discard)
 			)
-			.Script(ss => ss.Inline(PainlessScript).Lang("groovy"))
+			.Script(ss => ss.Inline(GroovyScript).Lang("groovy"))
 			.Conflicts(Conflicts.Proceed)
 			.Refresh();
 
@@ -95,7 +95,7 @@ protected override LazyResponses ClientUsage() => Calls(
 				VersionType = VersionType.Internal,
 				Routing = ReindexRouting.Discard
 			},
-			Script = new InlineScript(PainlessScript) { Lang = "groovy" },
+			Script = new InlineScript(GroovyScript) { Lang = "groovy" },
 			Conflicts = Conflicts.Proceed,
 			Refresh = true,
 		};
@@ -129,7 +129,7 @@ protected override void ExpectResponse(IReindexOnServerResponse response)
 				},
 				script = new
 				{
-					inline = this.PainlessScript,
+					inline = this.GroovyScript,
 					lang = "groovy"
 				},
 				source = new {

src/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerInvalidApiTests.cs

@@ -22,7 +22,7 @@ public ReindexOnServerInvalidApiTests(IntrusiveOperationCluster cluster, Endpoin
 		protected override int ExpectStatusCode => 500;
 
 		//bad painless script
-		protected override string PainlessScript { get; } = "if ctx._source.flag == 'bar') {ctx._source.remove('flag')}";
+		protected override string GroovyScript { get; } = "if ctx._source.flag == 'bar') {ctx._source.remove('flag')}";
 
 		protected override void ExpectResponse(IReindexOnServerResponse response)
 		{