Merge remote-tracking branch 'origin' into 7.0.x

samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp

@@ -1515,7 +1515,7 @@ void FakeResource::handler_DELETE_internal(const std::shared_ptr<restbed::Sessio
     
     if (status_code == 400) {
         responseHeaders.insert(std::make_pair("Content-Type", "text/plain"));
-        result = "Someting wrong";
+        result = "Something wrong";
     
         returnResponse(session, 400, result.empty() ? "{}" : result, responseHeaders);
         return;

samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.cpp

@@ -20,6 +20,7 @@
 #include <sstream>
 #include <stdexcept>
 #include <regex>
+#include <algorithm>
 #include <boost/lexical_cast.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>

samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.h

@@ -24,6 +24,7 @@
 #include "OuterEnumInteger.h"
 #include <memory>
 #include <vector>
+#include <array>
 #include <boost/property_tree/ptree.hpp>
 #include "helpers.h"
 

samples/server/petstore/cpp-restbed/test/java_client_tests/java_client/src/test/java/helper/TestingHelper.java

@@ -32,7 +32,7 @@ public class TestingHelper {
         Approvals.verify(message, removeTrailingSpaces);
     }
 
-    public static void approveResponseAsJson(Object reponseObject) {
+    public static void approveResponseAsJson(Object responseObject) {
         ObjectMapper objectMapper = new ObjectMapper();
         objectMapper.registerModule(new JavaTimeModule());
         objectMapper.setDateFormat(new StdDateFormat());
@@ -43,7 +43,7 @@ public class TestingHelper {
         String json = "";
 
         try {
-            json = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(reponseObject);
+            json = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(responseObject);
         } catch (JsonProcessingException e) {
             json = e.toString();
         }