Merge branch '2.x' of https://github.com/elastic/elasticsearch-net into 2.x

Author: gmarz

src/Tests/Framework/Integration/Process/ElasticsearchNode.cs

@@ -175,15 +175,20 @@ public IObservable<ElasticsearchMessage> Start(string[] additionalSettings = nul
 					}
 				}
 			}
-			var settings = new string[]
-			{
-				$"-Des.cluster.name={this.ClusterName}",
-				$"-Des.node.name={this.NodeName}",
-				$"-Des.path.repo={this.RepositoryPath}",
-				$"-Des.script.inline=on",
-				$"-Des.script.indexed=on",
-				$"--node.testingcluster true"
-			}.Concat(additionalSettings ?? Enumerable.Empty<string>());
+			var settings = new string[]
+			{
+				$"-Des.cluster.name={this.ClusterName}",
+				$"-Des.node.name={this.NodeName}",
+				$"-Des.path.repo={this.RepositoryPath}",
+				$"-Des.script.inline=on",
+				$"-Des.script.indexed=on",
+				$"--node.testingcluster true"
+			}
+			.Concat(additionalSettings ?? Enumerable.Empty<string>())
+			.OrderByDescending(s =>
+				s.StartsWith("-d", StringComparison.OrdinalIgnoreCase) ||
+				s.StartsWith("-p", StringComparison.OrdinalIgnoreCase))
+			.ThenBy(s => s);
 
 			this._process = new ObservableProcess(this.Binary, settings.ToArray());