diff --git a/README.md b/README.md
index 1457eb62ba1..d0d14f1a2c0 100644
--- a/README.md
+++ b/README.md
@@ -1,982 +1,32 @@
-# Swagger Code Generator
-
-[![Build Status](https://img.shields.io/travis/swagger-api/swagger-codegen/master.svg?label=Petstore%20Integration%20Test)](https://travis-ci.org/swagger-api/swagger-codegen)
-[![Run Status](https://img.shields.io/shippable/5782588a3be4f4faa56c5bea.svg?label=Mustache%20Template%20Test)](https://app.shippable.com/projects/5782588a3be4f4faa56c5bea)
-[![Windows Test](https://ci.appveyor.com/api/projects/status/github/swagger-api/swagger-codegen?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/swagger-codegen-wh2wu)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.swagger/swagger-codegen-project/badge.svg?style=plastic)](https://maven-badges.herokuapp.com/maven-central/io.swagger/swagger-codegen-project)
-[![PR Stats](http://issuestats.com/github/swagger-api/swagger-codegen/badge/pr)](http://issuestats.com/github/swagger-api/swagger-codegen) [![Issue Stats](http://issuestats.com/github/swagger-api/swagger-codegen/badge/issue)](http://issuestats.com/github/swagger-api/swagger-codegen)
-
-:star::star::star: If you would like to contribute, please refer to [guidelines](https://github.com/swagger-api/swagger-codegen/blob/master/CONTRIBUTING.md) and a list of [open tasks](https://github.com/swagger-api/swagger-codegen/issues?q=is%3Aopen+is%3Aissue+label%3A%22Need+community+contribution%22).:star::star::star:
-
-:notebook_with_decorative_cover: For more information, please refer to the [Wiki page](https://github.com/swagger-api/swagger-codegen/wiki) and [FAQ](https://github.com/swagger-api/swagger-codegen/wiki/FAQ) :notebook_with_decorative_cover:
-
-:warning: If the OpenAPI/Swagger spec is obtained from an untrusted source, please make sure you've reviewed the spec before using Swagger Codegen to generate the API client, server stub or documentation as [code injection](https://en.wikipedia.org/wiki/Code_injection) may occur :warning:
-
-:rocket: ProductHunt: https://producthunt.com/posts/swagger-codegen :rocket:
-
-## Overview
-This is the swagger codegen project, which allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an [OpenAPI Spec](https://github.com/OAI/OpenAPI-Specification). Currently, the following languages/frameworks are supported:
-
-- **API clients**: **ActionScript**, **Bash**, **C#** (.net 2.0, 4.0 or later), **C++** (cpprest, Qt5, Tizen), **Clojure**, **Dart**, **Elixir**, **Go**, **Groovy**, **Haskell**, **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign), **Node.js** (ES5, ES6, AngularJS with Google Closure Compiler annotations) **Objective-C**, **Perl**, **PHP**, **Python**, **Ruby**, **Scala**, **Swift** (2.x, 3.x), **Typescript** (Angular1.x, Angular2.x, Fetch, jQuery, Node)
-- **Server stubs**: **C#** (ASP.NET Core, NancyFx), **Erlang**, **Go**, **Haskell**, **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, RestEasy), **PHP** (Lumen, Slim, Silex, [Zend Expressive](https://github.com/zendframework/zend-expressive)), **Python** (Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Scala** ([Finch](https://github.com/finagle/finch), Scalatra)
-- **API documentation generators**: **HTML**, **Confluence Wiki** 
-- **Others**: **JMeter**
-
-Check out [OpenAPI-Spec](https://github.com/OAI/OpenAPI-Specification) for additional information about the OpenAPI project.
-
-# Table of contents
-
-  - [Swagger Code Generator](#swagger-code-generator)
-  - [Overview](#overview)
-  - [Table of Contents](#table-of-contents)
-  - Installation
-    - [Compatibility](#compatibility)
-    - [Prerequisites](#prerequisites)
-      - [OS X Users](#os-x-users)
-    - [Building](#building)
-    - [Docker](#docker)
-      - [Build and run](#build-and-run-using-docker)
-      - [Run docker in Vagrant](#run-docker-in-vagrant)
-      - [Public Docker image](#public-docker-image)
-    - [Homebrew](#homebrew)
-  - [Getting Started](#getting-started)
-  - Generators
-    - [To generate a sample client library](#to-generate-a-sample-client-library)
-    - [Generating libraries from your server](#generating-libraries-from-your-server)
-    - [Modifying the client library format](#modifying-the-client-library-format)
-    - [Making your own codegen modules](#making-your-own-codegen-modules)
-    - [Where is Javascript???](#where-is-javascript)
-    - [Generating a client from local files](#generating-a-client-from-local-files)
-    - [Customizing the generator](#customizing-the-generator)
-    - [Validating your OpenAPI Spec](#validating-your-openapi-spec)
-    - [Generating dynamic html api documentation](#generating-dynamic-html-api-documentation)
-    - [Generating static html api documentation](#generating-static-html-api-documentation)
-    - [To build a server stub](#to-build-a-server-stub)
-    - [To build the codegen library](#to-build-the-codegen-library)
-  - [Workflow Integration](#workflow-integration)
-  - [Github Integration](#github-integration)
-  - [Online Generators](#online-generators)
-  - [Guidelines for Contribution](https://github.com/swagger-api/swagger-codegen/wiki/Guidelines-for-Contribution)
-  - [Companies/Projects using Swagger Codegen](#companiesprojects-using-swagger-codegen)
-  - [Swagger Codegen Core Team](#swagger-codegen-core-team)
-  - [Swagger Codegen Evangelist](#swagger-codegen-evangelist)
-  - [License](#license)
-
-
-## Compatibility
-The OpenAPI Specification has undergone 3 revisions since initial creation in 2010.  The swagger-codegen project has the following compatibilities with the OpenAPI Specification:
-
-Swagger Codegen Version    | Release Date | OpenAPI Spec compatibility | Notes
--------------------------- | ------------ | -------------------------- | -----
-2.3.0 (upcoming minor release) | Apr/May 2017   | 1.0, 1.1, 1.2, 2.0   | Minor release with breaking changes
-2.2.3 (upcoming patch release) | TBD   | 1.0, 1.1, 1.2, 2.0   | Patch release without breaking changes
-[2.2.2](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.2.2) (**current stable**) | 2017-03-01   | 1.0, 1.1, 1.2, 2.0   | [tag v2.2.2](https://github.com/swagger-api/swagger-codegen/tree/v2.2.2)
-[2.2.1](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.2.1) | 2016-08-07   | 1.0, 1.1, 1.2, 2.0   | [tag v2.2.1](https://github.com/swagger-api/swagger-codegen/tree/v2.2.1)
-[2.1.6](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.1.6) | 2016-04-06   | 1.0, 1.1, 1.2, 2.0   | [tag v2.1.6](https://github.com/swagger-api/swagger-codegen/tree/v2.1.6)
-2.0.17                     | 2014-08-22   | 1.1, 1.2             | [tag v2.0.17](https://github.com/swagger-api/swagger-codegen/tree/v2.0.17)
-1.0.4                      | 2012-04-12   | 1.0, 1.1             | [tag v1.0.4](https://github.com/swagger-api/swagger-codegen/tree/swagger-codegen_2.9.1-1.1)
-
-
-### Prerequisites
-If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 7 runtime at a minimum):
-
-```
-wget http://central.maven.org/maven2/io/swagger/swagger-codegen-cli/2.2.2/swagger-codegen-cli-2.2.2.jar -O swagger-codegen-cli.jar
-
-java -jar swagger-codegen-cli.jar help
-```
-
-On a mac, it's even easier with `brew`:
-```
-brew install swagger-codegen
-```
-
-To build from source, you need the following installed and available in your $PATH:
-
-* [Java 7 or 8](http://java.oracle.com)
-
-* [Apache maven 3.3.3 or greater](http://maven.apache.org/)
-
-#### OS X Users
-Don't forget to install Java 7 or 8. You probably have 1.6.
-
-Export JAVA_HOME in order to use the supported Java version:
-```
-export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
-export PATH=${JAVA_HOME}/bin:$PATH
-```
-
-### Building
-
-After cloning the project, you can build it from source with this command:
-```
-mvn clean package
-```
-
-### Homebrew
-
-To install, run `brew install swagger-codegen`
-
-Here is an example usage:
-```
-swagger-codegen generate -i http://petstore.swagger.io/v2/swagger.json -l ruby -o /tmp/test/
-```
-
-### Docker
-
-#### Development in docker
-
-You can use `run-in-docker.sh` to do all development. This script maps your local repository to `/gen`
-in the docker container. It also maps `~/.m2/repository` to the appropriate container location.
-
-To execute `mvn package`:
-
-```
-git clone https://github.com/swagger-api/swagger-codegen
-cd swagger-codegen
-./run-in-docker.sh mvn package
-```
-
-Build artifacts are now accessible in your working directory.
-
-Once built, `run-in-docker.sh` will act as an executable for swagger-codegen-cli. To generate code, you'll need to output to a directory under `/gen` (e.g. `/gen/out`). For example:
-
-```
-./run-in-docker.sh help # Executes 'help' command for swagger-codegen-cli
-./run-in-docker.sh langs # Executes 'langs' command for swagger-codegen-cli
-./run-in-docker.sh /gen/bin/go-petstore.sh  # Builds the Go client
-./run-in-docker.sh generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml \
-    -l go -o /gen/out/go-petstore -DpackageName=petstore # generates go client, outputs locally to ./out/go-petstore
-```
-
-#### Run Docker in Vagrant
-Prerequisite: install [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
- ```
-git clone http://github.com/swagger-api/swagger-codegen.git
-cd swagger-codegen
-vagrant up
-vagrant ssh
-cd /vagrant
-./run-in-docker.sh mvn package
- ```
-
-#### Public Pre-built Docker images
-
- - https://hub.docker.com/r/swaggerapi/swagger-generator/ (official web service)
- - https://hub.docker.com/r/swaggerapi/swagger-codegen-cli/ (official CLI)
-
-
-##### Swagger Generator Docker Image
-
-The Swagger Generator image can act as a self-hosted web application and API for generating code. This container can be  incorporated into a CI pipeline, and requires at least two HTTP requests and some docker orchestration to access generated code.
-
-Example usage (note this assumes `jq` is installed for command line processing of JSON):
-
-```
-# Start container and save the container id
-CID=$(docker run -d swaggerapi/swagger-generator)
-# allow for startup
-sleep 5
-# Get the IP of the running container
-GEN_IP=$(docker inspect --format '{{.NetworkSettings.IPAddress}}'  $CID)
-# Execute an HTTP request and store the download link
-RESULT=$(curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d '{
-  "swaggerUrl": "http://petstore.swagger.io/v2/swagger.json"
-}' 'http://localhost:8188/api/gen/clients/javascript' | jq '.link' | tr -d '"')
-# Download the generated zip and redirect to a file
-curl $RESULT > result.zip
-# Shutdown the swagger generator image
-docker stop $CID && docker rm $CID
-```
-
-In the example above, `result.zip` will contain the generated client.
-
-##### Swagger Codegen CLI Docker Image
-
-The Swagger Codegen image acts as a standalone executable. It can be used as an alternative to installing via homebrew, or for developers who are unable to install Java or upgrade the installed version.
-
-To generate code with this image, you'll need to mount a local location as a volume.
-
-Example:
-
-```
-docker run --rm -v ${PWD}:/local swaggerapi/swagger-codegen-cli generate \
-    -i http://petstore.swagger.io/v2/swagger.json \
-    -l go \
-    -o /local/out/go
-```
-
-The generated code will be located under `./out/go` in the current directory.
-
-## Getting Started
-
-To generate a PHP client for http://petstore.swagger.io/v2/swagger.json, please run the following
-```sh
-git clone https://github.com/swagger-api/swagger-codegen
-cd swagger-codegen
-mvn clean package
-java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
-   -i http://petstore.swagger.io/v2/swagger.json \
-   -l php \
-   -o /var/tmp/php_api_client
-```
-(if you're on Windows, replace the last command with `java -jar modules\swagger-codegen-cli\target\swagger-codegen-cli.jar generate -i http://petstore.swagger.io/v2/swagger.json -l php -o c:\temp\php_api_client`)
-
-You can also download the JAR (latest release) directly from [maven.org](http://central.maven.org/maven2/io/swagger/swagger-codegen-cli/2.2.2/swagger-codegen-cli-2.2.2.jar)
-
-To get a list of **general** options available, please run `java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar help generate`
-
-To get a list of PHP specified options (which can be passed to the generator with a config file via the `-c` option), please run `java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar config-help -l php`
-
-## Generators
-
-### To generate a sample client library
-You can build a client against the swagger sample [petstore](http://petstore.swagger.io) API as follows:
-
-```
-./bin/java-petstore.sh
-```
-
-(On Windows, run `.\bin\windows\java-petstore.bat` instead)
-
-This will run the generator with this command:
-
-```
-java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
-  -i http://petstore.swagger.io/v2/swagger.json \
-  -l java \
-  -o samples/client/petstore/java
-```
-
-with a number of options. You can get the options with the `help generate` command (below only shows partal results):
-
-```
-NAME
-        swagger-codegen-cli generate - Generate code with chosen lang
-
-SYNOPSIS
-        swagger-codegen-cli generate
-                [(-a <authorization> | --auth <authorization>)]
-                [--additional-properties <additional properties>]
-                [--api-package <api package>] [--artifact-id <artifact id>]
-                [--artifact-version <artifact version>]
-                [(-c <configuration file> | --config <configuration file>)]
-                [-D <system properties>] [--group-id <group id>]
-                (-i <spec file> | --input-spec <spec file>)
-                [--import-mappings <import mappings>]
-                [--instantiation-types <instantiation types>]
-                [--invoker-package <invoker package>]
-                (-l <language> | --lang <language>)
-                [--language-specific-primitives <language specific primitives>]
-                [--library <library>] [--model-package <model package>]
-                [(-o <output directory> | --output <output directory>)]
-                [(-s | --skip-overwrite)]
-                [(-t <template directory> | --template-dir <template directory>)]
-                [--type-mappings <type mappings>] [(-v | --verbose)]
-
-OPTIONS
-        -a <authorization>, --auth <authorization>
-            adds authorization headers when fetching the swagger definitions
-            remotely. Pass in a URL-encoded string of name:header with a comma
-            separating multiple values
-	    
-...... (results omitted)    
-
-        -v, --verbose
-            verbose mode
-
-```
-
-You can then compile and run the client, as well as unit tests against it:
-
-```
-cd samples/client/petstore/java
-mvn package
-```
-
-Other languages have petstore samples, too:
-```
-./bin/android-petstore.sh
-./bin/java-petstore.sh
-./bin/objc-petstore.sh
-```
-
-### Generating libraries from your server
-It's just as easy--just use the `-i` flag to point to either a server or file.
-
-### Modifying the client library format
-Don't like the default swagger client syntax?  Want a different language supported?  No problem!  Swagger codegen processes mustache templates with the [jmustache](https://github.com/samskivert/jmustache) engine.  You can modify our templates or make your own.
-
-You can look at `modules/swagger-codegen/src/main/resources/${your-language}` for examples.  To make your own templates, create your own files and use the `-t` flag to specify your template folder.  It actually is that easy.
-
-### Making your own codegen modules
-If you're starting a project with a new language and don't see what you need, swagger-codegen can help you create a project to generate your own libraries:
-
-```
-java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar meta \
-  -o output/myLibrary -n myClientCodegen -p com.my.company.codegen
-```
-
-This will write, in the folder `output/myLibrary`, all the files you need to get started, including a README.md. Once modified and compiled, you can load your library with the codegen and generate clients with your own, custom-rolled logic.
-
-You would then compile your library in the `output/myLibrary` folder with `mvn package` and execute the codegen like such:
-
-```
-java -cp output/myLibrary/target/myClientCodegen-swagger-codegen-1.0.0.jar:modules/swagger-codegen-cli/target/swagger-codegen-cli.jar io.swagger.codegen.SwaggerCodegen
-```
-For Windows users, you will need to use `;` instead of `:` in the classpath, e.g.
-```
-java -cp output/myLibrary/target/myClientCodegen-swagger-codegen-1.0.0.jar;modules/swagger-codegen-cli/target/swagger-codegen-cli.jar io.swagger.codegen.SwaggerCodegen
-```
-
-Note the `myClientCodegen` is an option now, and you can use the usual arguments for generating your library:
-
-```
-java -cp output/myLibrary/target/myClientCodegen-swagger-codegen-1.0.0.jar:modules/swagger-codegen-cli/target/swagger-codegen-cli.jar \
-  io.swagger.codegen.SwaggerCodegen generate -l myClientCodegen\
-  -i http://petstore.swagger.io/v2/swagger.json \
-  -o myClient
-```
-
-### Where is Javascript???
-See our [javascript library](http://github.com/swagger-api/swagger-js)--it's completely dynamic and doesn't require
-static code generation.
-There is a third-party component called [swagger-js-codegen](https://github.com/wcandillon/swagger-js-codegen) that can generate angularjs or nodejs source code from a OpenAPI Specification.
-
-:exclamation: On Dec 7th 2015, a Javascript API client generator has been added by @jfiala.
-
-### Generating a client from local files
-If you don't want to call your server, you can save the OpenAPI Spec files into a directory and pass an argument
-to the code generator like this:
-
-```
--i ./modules/swagger-codegen/src/test/resources/2_0/petstore.json
-```
-
-Great for creating libraries on your ci server, from the [Swagger Editor](http://editor.swagger.io)... or while coding on an airplane.
-
-### Selective generation
-You may not want to generate *all* models in your project.  Likewise you may want just one or two apis to be written.  If that's the case, you can use system properties to control the output:
-
-The default is generate *everything* supported by the specific library.  Once you enable a feature, it will restrict the contents generated:
-
-```
-# generate only models
-java -Dmodels {opts}
-
-# generate only apis
-java -Dapis {opts}
-
-# generate only supporting files
-java -DsupportingFiles
-
-# generate models and supporting files
-java -Dmodels -DsupportingFiles
-```
-
-To control the specific files being generated, you can pass a CSV list of what you want:
-```
-# generate the User and Pet models only
--Dmodels=User,Pet
-
-# generate the User model and the supportingFile `StringUtil.java`:
--Dmodels=User -DsupportingFiles=StringUtil.java
-```
-
-To control generation of docs and tests for api and models, pass false to the option. For api, these options are  `-DapiTests=false` and `-DapiDocs=false`. For models, `-DmodelTests=false` and `-DmodelDocs=false`.
-These options default to true and don't limit the generation of the feature options listed above (like `-Dapi`):
-
-```
-# generate only models (with tests and documentation)
-java -Dmodels {opts}
-
-# generate only models (with tests but no documentation)
-java -Dmodels -DmodelDocs=false {opts}
-
-# generate only User and Pet models (no tests and no documentation)
-java -Dmodels=User,Pet -DmodelTests=false {opts}
-
-# generate only apis (without tests)
-java -Dapis -DapiTests=false {opts}
-
-# generate only apis (modelTests option is ignored)
-java -Dapis -DmodelTests=false {opts}
-```
-
-When using selective generation, _only_ the templates needed for the specific generation will be used.
-
-### Ignore file format
-
-Swagger codegen supports a `.swagger-codegen-ignore` file, similar to `.gitignore` or `.dockerignore` you're probably already familiar with.
-
-The ignore file allows for better control over overwriting existing files than the `--skip-overwrite` flag. With the ignore file, you can specify individual files or directories can be ignored. This can be useful, for example if you only want a subset of the generated code.
-
-Examples:
-
-```
-# Swagger Codegen Ignore
-# Lines beginning with a # are comments
-
-# This should match build.sh located anywhere.
-build.sh
-
-# Matches build.sh in the root
-/build.sh
-
-# Exclude all recursively
-docs/**
-
-# Explicitly allow files excluded by other rules
-!docs/UserApi.md
-
-# Recursively exclude directories named Api
-# You can't negate files below this directory.
-src/**/Api/
-
-# When this file is nested under /Api (excluded above),
-# this rule is ignored because parent directory is excluded by previous rule.
-!src/**/PetApiTests.cs
-
-# Exclude a single, nested file explicitly
-src/IO.Swagger.Test/Model/AnimalFarmTests.cs
-```
-
-The `.swagger-codegen-ignore` file must exist in the root of the output directory.
-
-### Customizing the generator
-
-There are different aspects of customizing the code generator beyond just creating or modifying templates.  Each language has a supporting configuration file to handle different type mappings, etc:
-
-```
-$ ls -1 modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/
-AbstractJavaJAXRSServerCodegen.java
-AbstractTypeScriptClientCodegen.java
-... (results omitted)
-TypeScriptAngularClientCodegen.java
-TypeScriptNodeClientCodegen.java
-```
-
-Each of these files creates reasonable defaults so you can get running quickly.  But if you want to configure package names, prefixes, model folders, etc. you can use a json config file to pass the values.
-
-```
-java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
-  -i http://petstore.swagger.io/v2/swagger.json \
-  -l java \
-  -o samples/client/petstore/java \
-  -c path/to/config.json
-```
-and `config.json` contains the following as an example:
-```
-{
-  "apiPackage" : "petstore"
-}
-```
-
-Supported config options can be different per language. Running `config-help -l {lang}` will show available options.  
-**These options are applied via configuration file (e.g. config.json) or by passing them with `-D{optionName}={optionValue}`**. (If `-D{optionName}` does not work, please open a [ticket](https://github.com/swagger-api/swagger-codegen/issues/new) and we'll look into it)
-
-```
-java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar config-help -l java
-```
-
-Output
-
-```
-CONFIG OPTIONS
-	modelPackage
-	    package for generated models
-
-	apiPackage
-	    package for generated api classes
-...... (results omitted)
-	library
-	    library template (sub-template) to use:
-	    jersey1 - HTTP client: Jersey client 1.18. JSON processing: Jackson 2.4.2
-	    jersey2 - HTTP client: Jersey client 2.6
-	    feign - HTTP client: Netflix Feign 8.1.1.  JSON processing: Jackson 2.6.3
-	    okhttp-gson (default) - HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1
-	    retrofit - HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1 (Retrofit 1.9.0)
-        retrofit2 - HTTP client: OkHttp 2.5.0. JSON processing: Gson 2.4 (Retrofit 2.0.0-beta2)
-```
-
-Your config file for Java can look like
-
-```json
-{
-  "groupId":"com.my.company",
-  "artifactId":"MyClient",
-  "artifactVersion":"1.2.0",
-  "library":"feign"
-}
-```
-
-For all the unspecified options default values will be used.
-
-Another way to override default options is to extend the config class for the specific language.
-To change, for example, the prefix for the Objective-C generated files, simply subclass the ObjcClientCodegen.java:
-
-```java
-package com.mycompany.swagger.codegen;
-
-import io.swagger.codegen.languages.*;
-
-public class MyObjcCodegen extends ObjcClientCodegen {
-    static {
-        PREFIX = "HELO";
-    }
-}
-```
-
-and specify the `classname` when running the generator:
-
-```
--l com.mycompany.swagger.codegen.MyObjcCodegen
-```
-
-Your subclass will now be loaded and overrides the `PREFIX` value in the superclass.
-
-### Bringing your own models
-
-Sometimes you don't want a model generated.  In this case, you can simply specify an import mapping to tell
-the codegen what _not_ to create.  When doing this, every location that references a specific model will
-refer back to your classes.  Note, this may not apply to all languages...
-
-To specify an import mapping, use the `--import-mappings` argument and specify the model-to-import logic as such:
-
-```
---import-mappings Pet=my.models.MyPet
-```
-
-Or for multiple mappings:
-
-```
-Pet=my.models.MyPet,Order=my.models.MyOrder
-```
-
-### Validating your OpenAPI Spec
-
-You have options.  The easiest is to use our [online validator](https://github.com/swagger-api/validator-badge) which not only will let you validate your spec, but with the debug flag, you can see what's wrong with your spec.  For example:
-
-http://online.swagger.io/validator/debug?url=http://petstore.swagger.io/v2/swagger.json
-
-### Generating dynamic html api documentation
-
-To do so, just use the `-l dynamic-html` flag when reading a spec file.  This creates HTML documentation that is available as a single-page application with AJAX.  To view the documentation:
-
-```
-cd samples/dynamic-html/
-npm install
-node .
-```
-
-Which launches a node.js server so the AJAX calls have a place to go.
-
-
-### Generating static html api documentation
-
-To do so, just use the `-l html` flag when reading a spec file.  This creates a single, simple HTML file with embedded css so you can ship it as an email attachment, or load it from your filesystem:
-
-```
-cd samples/html/
-open index.html
-```
-
-
-### To build a server stub
-
-Please refer to https://github.com/swagger-api/swagger-codegen/wiki/Server-stub-generator-HOWTO for more information.
-
-### To build the codegen library
-
-This will create the swagger-codegen library from source.
-
-```
-mvn package
-```
-
-Note!  The templates are included in the library generated.  If you want to modify the templates, you'll need to either repackage the library OR specify a path to your scripts
-
-## Workflow integration
-
-You can use the [swagger-codegen-maven-plugin](modules/swagger-codegen-maven-plugin/README.md) for integrating with your workflow, and generating any codegen target.
-
-## GitHub Integration
-
-To push the auto-generated SDK to GitHub, we provide `git_push.sh` to streamline the process. For example:
-
- 1) Create a new repository in GitHub (Ref: https://help.github.com/articles/creating-a-new-repository/)
-
- 2) Generate the SDK
-```
- java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
- -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l perl \
- --git-user-id "wing328" \
- --git-repo-id "petstore-perl" \
- --release-note "Github integration demo" \
- -o /var/tmp/perl/petstore
-```
- 3) Push the SDK to GitHub
-```
-cd /var/tmp/perl/petstore
-/bin/sh ./git_push.sh
-```
-
-## Online generators
-
-One can also generate API client or server using the online generators (https://generator.swagger.io)
-
-For example, to generate Ruby API client, simply send the following HTTP request using curl:
-```
-curl -X POST -H "content-type:application/json" -d '{"swaggerUrl":"http://petstore.swagger.io/v2/swagger.json"}' https://generator.swagger.io/api/gen/clients/ruby
-```
-Then you will receieve a JSON response with the URL to download the zipped code.
-
-To customize the SDK, you can `POST` to `https://generator.swagger.io/gen/clients/{language}` with the following HTTP body:
-```
-{
-  "options": {},
-  "swaggerUrl": "http://petstore.swagger.io/v2/swagger.json"
-}
-```
-in which the `options` for a language can be obtained by submitting a `GET` request to `https://generator.swagger.io/api/gen/clients/{language}`:
-
-For example, `curl https://generator.swagger.io/api/gen/clients/python` returns
-```
-{
-  "packageName":{
-    "opt":"packageName",
-    "description":"python package name (convention: snake_case).",
-    "type":"string",
-    "default":"swagger_client"
-  },
-  "packageVersion":{
-    "opt":"packageVersion",
-    "description":"python package version.",
-    "type":"string",
-    "default":"1.0.0"
-  },
-  "sortParamsByRequiredFlag":{
-    "opt":"sortParamsByRequiredFlag",
-    "description":"Sort method arguments to place required parameters before optional parameters.",
-    "type":"boolean",
-    "default":"true"
-  }
-}
-```
-To set package name to `pet_store`, the HTTP body of the request is as follows:
-```
-{
-  "options": {
-    "packageName": "pet_store"
-  },
-  "swaggerUrl": "http://petstore.swagger.io/v2/swagger.json"
-}
-```
-and here is the curl command:
-```
-curl -H "Content-type: application/json" -X POST -d '{"options": {"packageName": "pet_store"},"swaggerUrl": "http://petstore.swagger.io/v2/swagger.json"}' https://generator.swagger.io/api/gen/clients/python
-```
-
-Instead of using `swaggerUrl` with an URL to the OpenAPI/Swagger spec, one can include the spec in the JSON payload with `spec`, e.g.
-```
-{
-  "options": {},
-  "spec": {
-    "swagger": "2.0",
-    "info": {
-      "version": "1.0.0",
-      "title": "Test API"
-    },
-    ...
-  }
-}
-```
-
-Guidelines for Contribution
----------------------------
-
-Please refer to this [page](https://github.com/swagger-api/swagger-codegen/blob/master/CONTRIBUTING.md)
-
-Companies/Projects using Swagger Codegen
-----------------------------------------
-Here are some companies/projects using Swagger Codegen in production. To add your company/project to the list, please visit [README.md](https://github.com/swagger-api/swagger-codegen/blob/master/README.md) and click on the icon to edit the page.
-- [Activehours](https://www.activehours.com/)
-- [Acunetix](https://www.acunetix.com/)
-- [Atlassian](https://www.atlassian.com/)
-- [Autodesk](http://www.autodesk.com/)
-- [Avenida Compras S.A.](https://www.avenida.com.ar)
-- [AYLIEN](http://aylien.com/)
-- [Balance Internet](https://www.balanceinternet.com.au/)
-- [beemo](http://www.beemo.eu)
-- [bitly](https://bitly.com)
-- [Box](https://box.com)
-- [Bufferfly Network](https://www.butterflynetinc.com/)
-- [Cachet Financial](http://www.cachetfinancial.com/)
-- [carpolo](http://www.carpolo.co/)
-- [CloudBoost](https://www.CloudBoost.io/)
-- [Cisco](http://www.cisco.com/)
-- [Conplement](http://www.conplement.de/)
-- [Cummins](http://www.cummins.com/)
-- [Cupix](http://www.cupix.com)
-- [DBBest Technologies](https://www.dbbest.com)
-- [DecentFoX](http://decentfox.com/)
-- [DocRaptor](https://docraptor.com)
-- [DocuSign](https://www.docusign.com)
-- [Ergon](http://www.ergon.ch/)
-- [Dell EMC](https://www.emc.com/)
-- [eureka](http://eure.jp/)
-- [everystory.us](http://everystory.us)
-- [Expected Behavior](http://www.expectedbehavior.com/)
-- [Fastly](https://www.fastly.com/)
-- [Flat](https://flat.io)
-- [Finder](http://en.finder.pl/)
-- [FH Münster - University of Applied Sciences](http://www.fh-muenster.de)
-- [Fotition](https://www.fotition.com/)
-- [Gear Zero Network](https://www.gearzero.ca)
-- [Germin8](http://www.germin8.com)
-- [GigaSpaces](http://www.gigaspaces.com)
-- [goTransverse](http://www.gotransverse.com/api)
-- [GraphHopper](https://graphhopper.com/)
-- [Gravitate Solutions](http://gravitatesolutions.com/)
-- [HashData](http://www.hashdata.cn/)
-- [Hewlett Packard Enterprise](https://hpe.com)
-- [High Technologies Center](http://htc-cs.com)
-- [IBM](https://www.ibm.com)
-- [IMS Health](http://www.imshealth.com/en/solution-areas/technology-and-applications)
-- [Individual Standard IVS](http://www.individual-standard.com) 
-- [Intent HQ](http://www.intenthq.com)
-- [Interactive Intelligence](http://developer.mypurecloud.com/)
-- [Kabuku](http://www.kabuku.co.jp/en)
-- [Kurio](https://kurio.co.id)
-- [Kuroi](http://kuroiwebdesign.com/)
-- [Kuary](https://kuary.com/)
-- [Kubernetes](https://kubernetes.io/)
-- [LANDR Audio](https://www.landr.com/)
-- [Lascaux](http://www.lascaux.it/)
-- [Leica Geosystems AG](http://leica-geosystems.com)
-- [LiveAgent](https://www.ladesk.com/)
-- [LXL Tech](http://lxltech.com)
-- [Lyft](https://www.lyft.com/developers)
-- [MailMojo](https://mailmojo.no/)
-- [Mindera](http://mindera.com/)
-- [Mporium](http://mporium.com/)
-- [Neverfail](https://neverfail.com/)
-- [nViso](http://www.nviso.ch/)
-- [Okiok](https://www.okiok.com)
-- [Onedata](http://onedata.org)
-- [OrderCloud.io](http://ordercloud.io)
-- [OSDN](https://osdn.jp)
-- [PagerDuty](https://www.pagerduty.com)
-- [PagerTree](https://pagertree.com)
-- [Pepipost](https://www.pepipost.com)
-- [Plexxi](http://www.plexxi.com)
-- [Pixoneye](http://www.pixoneye.com/)
-- [PostAffiliatePro](https://www.postaffiliatepro.com/)
-- [PracticeBird](https://www.practicebird.com/)
-- [Prill Tecnologia](http://www.prill.com.br)
-- [QAdept](http://qadept.com/)
-- [QuantiModo](https://quantimo.do/)
-- [QuickBlox](https://quickblox.com/)
-- [Rapid7](https://rapid7.com/)
-- [Reload! A/S](https://reload.dk/)
-- [REstore](https://www.restore.eu)
-- [Revault Sàrl](http://revault.ch)
-- [Riffyn](https://riffyn.com)
-- [Royal Bank of Canada (RBC)](http://www.rbc.com/canada.html)
-- [Saritasa](https://www.saritasa.com/)
-- [SCOOP Software GmbH](http://www.scoop-software.de)
-- [Shine Solutions](https://shinesolutions.com/)
-- [Simpfony](https://www.simpfony.com/)
-- [Skurt](http://www.skurt.com)
-- [Slamby](https://www.slamby.com/)
-- [SmartRecruiters](https://www.smartrecruiters.com/)
-- [snapCX](https://snapcx.io)
-- [SPINEN](http://www.spinen.com)
-- [SRC](https://www.src.si/)
-- [Stardog Ventures](https://www.stardog.io)
-- [Stingray](http://www.stingray.com)
-- [StyleRecipe](http://stylerecipe.co.jp)
-- [Svenska Spel AB](https://www.svenskaspel.se/)
-- [Switch Database](https://www.switchdatabase.com/)
-- [TaskData](http://www.taskdata.com/)
-- [ThoughtWorks](https://www.thoughtworks.com)
-- [Trexle](https://trexle.com/)
-- [Upwork](http://upwork.com/)
-- [uShip](https://www.uship.com/)
-- [VMware](https://vmware.com/)
-- [W.UP](http://wup.hu/?siteLang=en)
-- [Wealthfront](https://www.wealthfront.com/)
-- [Webever GmbH](https://www.webever.de/)
-- [WEXO A/S](https://www.wexo.dk/)
-- [XSky](http://www.xsky.com/)
-- [Yelp](http://www.yelp.com/)
-- [Zalando](https://tech.zalando.com)
-- [ZEEF.com](https://zeef.com/)
-
-
-# Swagger Codegen Core Team
-
-Swagger Codegen core team members are contributors who have been making significant contributions (review issues, fix bugs, make enhancements, etc) to the project on a regular basis.
-
-## API Clients
-| Languages     | Core Team (join date) |
-|:-------------|:-------------|
-| ActionScript | |
-| C++      |  |  
-| C#      | @jimschubert (2016/05/01) |  |
-| Clojure | @xhh (2016/05/01) |
-| Dart      |  |  
-| Groovy     |  |  
-| Go     |  @guohuang (2016/05/01) @neilotoole (2016/05/01) |  
-| Java      | @cbornet (2016/05/01) @xhh (2016/05/01) @epaul (2016/06/04) |
-| Java (Spring Cloud) | @cbornet (2016/07/19) |
-| NodeJS/Javascript | @xhh (2016/05/01) |
-| ObjC      | @mateuszmackowiak (2016/05/09) |
-| Perl      | @wing328 (2016/05/01) |
-| PHP      | @arnested (2016/05/01) |
-| Python   | @scottrw93 (2016/05/01) |
-| Ruby      | @wing328 (2016/05/01) @zlx (2016/05/22) |
-| Scala     |  |
-| Swift     | @jaz-ah (2016/05/01)  @Edubits (2016/05/01) |
-| TypeScript (Node) | @Vrolijkx (2016/05/01) |
-| TypeScript (Angular1) | @Vrolijkx (2016/05/01) |
-| TypeScript (Angular2) | @Vrolijkx (2016/05/01) |
-| TypeScript (Fetch) |  |
-## Server Stubs
-| Languages     | Core Team (date joined) |
-|:------------- |:-------------|
-| C# ASP.NET5 |  @jimschubert (2016/05/01) |
-| Go Server | @guohuang (2016/06/13) |
-| Haskell Servant |  |
-| Java Spring Boot | @cbornet (2016/07/19) |
-| Java Spring MVC | @kolyjjj (2016/05/01) @cbornet (2016/07/19) |
-| Java JAX-RS |  |
-| Java Play Framework |  |
-| NancyFX |  |
-| NodeJS | @kolyjjj (2016/05/01) |  
-| PHP Lumen | @abcsum (2016/05/01) |
-| PHP Silex |  |
-| PHP Slim  |  |
-| Python Flask  |  |
-| Ruby Sinatra     | @wing328 (2016/05/01) |  |
-| Scala Scalatra |  |  |
-| Scala Finch | @jimschubert (2017/01/28) |
-
-
-## Template Creator
-Here is a list of template creators:
- * API Clients:
-   * Akka-Scala: @cchafer
-   * Apex: @asnelling
-   * Bash: @bkryza
-   * C++ REST: @Danielku15
-   * C# (.NET 2.0): @who
-   * C# (.NET Standard 1.3 ): @Gronsak
-   * Clojure: @xhh
-   * Dart: @yissachar
-   * Elixir: @niku
-   * Groovy: @victorgit
-   * Go: @wing328
-   * Go (rewritten in 2.3.0): @antihax
-   * Java (Feign): @davidkiss
-   * Java (Retrofit): @0legg
-   * Java (Retrofi2): @emilianobonassi
-   * Java (Jersey2): @xhh
-   * Java (okhttp-gson): @xhh
-   * Java (RestTemplate): @nbruno
-   * Java (RESTEasy): @gayathrigs
-   * Javascript/NodeJS: @jfiala
-   * Javascript (Closure-annotated Angular) @achew22
-   * JMeter @davidkiss
-   * Perl: @wing328
-   * PHP (Guzzle): @baartosz
-   * Swift: @tkqubo
-   * Swift 3: @hexelon
-   * TypeScript (Node):  @mhardorf
-   * TypeScript (Angular1):  @mhardorf
-   * TypeScript (Fetch): @leonyu
-   * TypeScript (Angular2): @roni-frantchi
-   * TypeScript (jQuery): @bherila 
- * Server Stubs
-   * C# ASP.NET5: @jimschubert
-   * C# NancyFX: @mstefaniuk
-   * Erlang Server: @galaxie
-   * Go Server: @guohuang
-   * Haskell Servant: @algas
-   * Java MSF4J: @sanjeewa-malalgoda
-   * Java Spring Boot: @diyfr
-   * Java Undertow: @stevehu
-   * Java Play Framework: @JFCote
-   * JAX-RS RestEasy: @chameleon82
-   * JAX-RS CXF: @hiveship
-   * JAX-RS CXF (CDI): @nickcmaynard
-   * JAX-RS RestEasy (JBoss EAP): @jfiala
-   * PHP Lumen: @abcsum
-   * PHP Slim: @jfastnacht
-   * PHP Zend Expressive (with Path Handler): @Articus
-   * Ruby on Rails 5: @zlx
-   * Scala Finch: @jimschubert
- * Documentation
-   * HTML Doc 2: @jhitchcock
-   * Confluence Wiki: @jhitchcock
-
-## How to join the core team
-
-Here are the requirements to become a core team member:
-- rank within top 50 in https://github.com/swagger-api/swagger-codegen/graphs/contributors
-  - to contribute, here are some good [starting points](https://github.com/swagger-api/swagger-codegen/issues?q=is%3Aopen+is%3Aissue+label%3A%22Need+community+contribution%22)
-- regular contributions to the project
-  - about 3 hours per week
-  - for contribution, it can be addressing issues, reviewing PRs submitted by others, submitting PR to fix bugs or make enhancements, etc
-
- To join the core team, please reach out to wing328hk@gmail.com (@wing328) for more information.
-
- To become a Template Creator, simply submit a PR for new API client (e.g. Rust, Elixir) or server stub (e.g. Ruby Grape) generator.
-
-# Swagger Codegen Evangelist
-
-Swagger Codegen Evangelist shoulders one or more of the following responsibilities:
-
-- publishes articles on the benefit of Swagger Codegen
-- organizes local Meetups
-- presents the benefits of Swagger Codegen in local Meetups or conferences
-- actively answers questions from others in [Github](https://github.com/swagger-api/swagger-codegen/issues), [StackOverflow](stackoverflow.com/search?q=%5Bswagger%5D)
-- submits PRs to improve Swagger Codegen
-- reviews PRs submitted by the others
-- ranks within top 100 in the [contributor list](https://github.com/swagger-api/swagger-codegen/graphs/contributors)
-
-If you want to be a Swagger Codegen Evangelist, please kindly apply by sending an email to wing328hk@gmail.com (@wing328)
-
-### List of Swagger Codegen Evangelists
-
-- Cliffano Subagio (@cliffano from Australia joined on Dec 9, 2016)
-  - [Building An AEM API Clients Ecosystem](http://www.slideshare.net/cliffano/building-an-aem-api-clients-ecosystem)
-  - [Adobe Marketing Cloud Community Expo](http://blog.cliffano.com/2016/11/10/adobe-marketing-cloud-community-expo/)
-
-# License information on Generated Code
-
-The Swagger Codegen project is intended as a benefit for users of the Swagger / Open API Specification.  The project itself has the [License](#license) as specified.  In addition, please understand the following points:
-
-* The templates included with this project are subject to the [License](#license).
-* Generated code is intentionally _not_ subject to the parent project license
-
-When code is generated from this project, it shall be considered **AS IS** and owned by the user of the software.  There are no warranties--expressed or implied--for generated code.  You can do what you wish with it, and once generated, the code is your responsibility and subject to the licensing terms that you deem appropriate.
-
-License
--------
-
-Copyright 2017 SmartBear Software
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
----
-<img src="http://swagger.io/wp-content/uploads/2016/02/logo.jpg"/>
-
+Fork of [swagger-codegen](https://github.com/swagger-api/swagger-codegen), primarily maintained by the Elastic Cloud team.
+
+### Why fork?
+
+The Cloud team relies on the Scala and Java clients, generated from our [OpenAPI specification](https://github.com/elastic/cloud/blob/master/scala-services/adminconsole/src/main/resources/apidocs-full.json), for building our integration tests. The Scala client in particular has proven to be buggy. Despite our efforts to contribute patches upstream, each new version of the client seems to bring on newer problems :smile:. We've decided it's easier to just maintain our own fork for the sake of having a stable and reliable client for our tests.
+
+### Publishing a new version to our artifactory
+
+  - First, join the `#cloud-api` channel on Slack and give the Cloud API team a heads up :smile:
+  - Open a PR bumping the version in:
+    - [parent pom.xml](https://github.com/elastic/swagger-codegen/blob/master/pom.xml)
+    - [swagger-codegen pom.xml](https://github.com/elastic/swagger-codegen/blob/master/modules/swagger-codegen/pom.xml)
+    - [swagger-codegen-cli pom.xml](https://github.com/elastic/swagger-codegen/blob/master/modules/swagger-codegen-cli/pom.xml)
+    - [swagger-codegen-maven-plugin pom.xml](https://github.com/elastic/swagger-codegen/blob/master/modules/swagger-codegen-maven-plugin/pom.xml)
+    - [swagger-generator pom.xml](https://github.com/elastic/swagger-codegen/blob/master/modules/swagger-generator/pom.xml)
+  - CI-Staging [Jenkins job](https://ci-staging.found.no/job/cloud-swagger-codegen-fork/) is no longer working way to publish Maven Artifacts. Instead, when a PR is merged to master, artifacts need to be packaged locally:
+    - Run `mvn clean package` target from the master branch.
+    - Then, there are two possible ways:
+        1) Run  `mvn -Darguments=-DskipTests clean deploy` target to deploy to Artifactory. For that you need to have local `~/.m2/settings.xml` configured.
+        2) Deploy using [Artifactory](https://artifactory.elastic.dev/ui/repos/tree/General/cloud-release) UI `Deploy` button
+
+#### A quick guide on how to configure `settings.xml` file:
+[Artifactory](https://artifactory.elastic.dev/) provides a nice UI to help to setup settings file:
+- Go to the `Artifacts` section (left column)
+- Click the `Set Me Up` button on the top right
+- Choose `cloud-release-local` repository
+- Click `Generate Maven Settings` and copy generated file
+- To deploy, you'll need to replace username with your `@elastic.co` email and password with the `API Key` generated in the `Edit Profile` section:
+  ```
+  <username>${security.getCurrentUsername()}</username>
+  <password>${security.getEscapedEncryptedPassword()!"*** Insert encrypted password here ***"</password>
+  ```
diff --git a/modules/swagger-codegen-cli/pom.xml b/modules/swagger-codegen-cli/pom.xml
index e175b2c4585..8cc978d408a 100644
--- a/modules/swagger-codegen-cli/pom.xml
+++ b/modules/swagger-codegen-cli/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.2.3-SNAPSHOT</version>
+        <version>2.2.10-elastic-cloud</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-codegen-maven-plugin/pom.xml b/modules/swagger-codegen-maven-plugin/pom.xml
index 994b6af88d2..6c6d4b27ccf 100644
--- a/modules/swagger-codegen-maven-plugin/pom.xml
+++ b/modules/swagger-codegen-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.2.3-SNAPSHOT</version>
+        <version>2.2.10-elastic-cloud</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>swagger-codegen-maven-plugin</artifactId>
diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml
index 05206eb2f9b..93fd1f26542 100644
--- a/modules/swagger-codegen/pom.xml
+++ b/modules/swagger-codegen/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.2.3-SNAPSHOT</version>
+        <version>2.2.10-elastic-cloud</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-codegen/src/main/resources/scala/api.mustache b/modules/swagger-codegen/src/main/resources/scala/api.mustache
index c3dd3effe7d..b0cb740634b 100644
--- a/modules/swagger-codegen/src/main/resources/scala/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/scala/api.mustache
@@ -31,7 +31,7 @@ class {{classname}}(val defBasePath: String = "{{{basePath}}}",
 {{#allParams}}   * @param {{paramName}} {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
 {{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
    */
-  def {{operationId}}({{#allParams}}{{paramName}}: {{#required}}{{dataType}}{{#defaultValue}} /* = {{{defaultValue}}}*/{{/defaultValue}}{{/required}}{{^required}}Option[{{dataType}}]{{#defaultValue}} /* = {{{defaultValue}}}*/{{/defaultValue}}{{^defaultValue}} = None{{/defaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#returnType}}: Option[{{returnType}}]{{/returnType}} = {
+  def {{operationId}}({{#allParams}}{{paramName}}: {{#required}}{{dataType}}{{#defaultValue}} /* = {{{defaultValue}}}*/{{/defaultValue}}{{/required}}{{^required}}Option[{{dataType}}]{{#defaultValue}} = None /* = {{{defaultValue}}}*/{{/defaultValue}}{{^defaultValue}} = None{{/defaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#returnType}}: Option[{{returnType}}]{{/returnType}} = {
     // create path and map variables
     val path = "{{{path}}}".replaceAll("\\{format\\}", "json"){{#pathParams}}.replaceAll("\\{" + "{{baseName}}" + "\\}",apiInvoker.escape({{paramName}})){{/pathParams}}
 
@@ -72,7 +72,7 @@ class {{classname}}(val defBasePath: String = "{{{basePath}}}",
     {{/required}}
     {{/headerParams}}
 
-    var postBody: AnyRef = {{#bodyParam}}{{#required}}{{paramName}}{{/required}}{{^required}}{{paramName}}.map(paramVal => paramVal){{/required}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}
+    var postBody: AnyRef = {{#bodyParam}}{{#required}}{{paramName}}{{/required}}{{^required}}{{paramName}}.map(paramVal => paramVal).getOrElse(null){{/required}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}
 
     if (contentType.startsWith("multipart/form-data")) {
       val mp = new FormDataMultiPart
diff --git a/modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache
index e1e420d7c6d..1eda6ad58c3 100644
--- a/modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache
+++ b/modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache
@@ -25,12 +25,47 @@ import com.fasterxml.jackson.core.JsonGenerator.Feature
 import com.fasterxml.jackson.databind._
 import com.fasterxml.jackson.annotation._
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
+import com.fasterxml.jackson.databind.ser.std.StdSerializer
+import com.fasterxml.jackson.databind.ser.BeanSerializerModifier
+import com.fasterxml.jackson.databind.module.SimpleModule
+import com.fasterxml.jackson.core.JsonGenerator
+
+
+private class CustomSomeSerializer extends StdSerializer[Some[_]](classOf[Some[_]]) {
+  override def serialize(
+    value: Some[_],
+    gen: JsonGenerator,
+    provider: SerializerProvider
+  ): Unit = {
+    value match {
+      case Some(x) if x == null => provider.defaultSerializeNull(gen)
+      case Some(x) => provider.defaultSerializeValue(x, gen)
+    }
+  }
+}
+
+
+private class CustomModifier extends BeanSerializerModifier {
+  override def modifySerializer(
+    config: SerializationConfig,
+    beanDesc: BeanDescription,
+    serializer: JsonSerializer[_]
+  ): JsonSerializer[_] = {
+    beanDesc.getBeanClass match {
+      case c if c == classOf[Some[_]] => new CustomSomeSerializer
+      case _ => serializer
+    }
+  }
+}
 
 object ScalaJsonUtil {
   def getJsonMapper = {
     val mapper = new ObjectMapper()
+    val customModule = new SimpleModule("custom module")
+    customModule.setSerializerModifier(new CustomModifier)
     mapper.registerModule(new DefaultScalaModule())
     mapper.registerModule(new JodaModule());
+    mapper.registerModule(customModule)
     mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT)
     mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
@@ -52,6 +87,9 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
   def escape(value: String): String = {
     URLEncoder.encode(value, "utf-8").replaceAll("\\+", "%20")
   }
+  def escape(values: List[String]): String = {
+     values.map(escape).mkString(",")
+  }
 
   def escape(value: Long): String = value.toString
   def escape(value: Double): String = value.toString
@@ -93,6 +131,7 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
     if (obj != null) {
       obj match {
         case e: List[_] => mapper.writeValueAsString(obj.asInstanceOf[List[_]].asJava)
+        case e: String => e
         case _ => mapper.writeValueAsString(obj)
       }
     } else null
@@ -101,8 +140,13 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
   def invokeApi(host: String, path: String, method: String, queryParams: Map[String, String], formParams: Map[String, String], body: AnyRef, headerParams: Map[String, String], contentType: String): String = {
     val client = getClient(host)
 
-    val querystring = queryParams.filter(k => k._2 != null).map(k => (escape(k._1) + "=" + escape(k._2))).mkString("?", "&", "")
-    val builder = client.resource(host + path + querystring).accept(contentType)
+    val normalisedQueryParams = queryParams.filter(k => k._2 != null).map(k => (escape(k._1) + "=" + escape(k._2)))
+
+    val normalisedQuery = if(normalisedQueryParams.nonEmpty) {
+      normalisedQueryParams.mkString("?", "&", "")
+    } else ""
+
+    val builder = client.resource(host + path + normalisedQuery).accept(contentType)
     headerParams.map(p => builder.header(p._1, p._2))
     defaultHeaders.map(p => {
       headerParams.contains(p._1) match {
@@ -117,9 +161,8 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
     }
 
     val response: ClientResponse = method match {
-      case "GET" => {
+      case "GET" =>
         builder.get(classOf[ClientResponse]).asInstanceOf[ClientResponse]
-      }
       case "POST" => {
         if(formData != null) builder.post(classOf[ClientResponse], formData)
         else if(body != null && body.isInstanceOf[File]) {
@@ -140,7 +183,13 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
         else builder.`type`(contentType).put(classOf[ClientResponse], serialize(body))
       }
       case "DELETE" => {
-        builder.delete(classOf[ClientResponse])
+        if(body == null) builder.delete(classOf[ClientResponse])
+        else builder.`type`(contentType).delete(classOf[ClientResponse], serialize(body))
+      }
+      case "PATCH" => {
+        if(formData != null) builder.header("X-HTTP-Method-Override", "PATCH").post(classOf[ClientResponse], formData)
+        else if(body == null) builder.header("X-HTTP-Method-Override", "PATCH").post(classOf[ClientResponse], null)
+        else builder.header("X-HTTP-Method-Override", "PATCH").`type`(contentType).post(classOf[ClientResponse], serialize(body))
       }
       case _ => null
     }
@@ -159,7 +208,7 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
         }
         throw new ApiException(
           response.getStatusInfo().getStatusCode(),
-          entity)
+          s"$entity - ${response.toString} with headers: ${response.getHeaders}")
       }
     }
   }
diff --git a/modules/swagger-codegen/src/main/resources/scala/model.mustache b/modules/swagger-codegen/src/main/resources/scala/model.mustache
index 12b635bfb3e..f44fc1e5a78 100644
--- a/modules/swagger-codegen/src/main/resources/scala/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/scala/model.mustache
@@ -12,7 +12,7 @@ case class {{classname}} (
   {{#description}}
   /* {{{description}}} */
   {{/description}}
-  {{{name}}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}
+  {{{name}}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}] = None{{/required}}{{#hasMore}},{{/hasMore}}
   {{/vars}}
 )
 
diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml
index 6bb0c8ee45a..dada38402ae 100644
--- a/modules/swagger-generator/pom.xml
+++ b/modules/swagger-generator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.2.3-SNAPSHOT</version>
+        <version>2.2.10-elastic-cloud</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>swagger-generator</artifactId>
diff --git a/pom.xml b/pom.xml
index 9a8c16156fc..b8022d78421 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,12 +9,12 @@
     <artifactId>swagger-codegen-project</artifactId>
     <packaging>pom</packaging>
     <name>swagger-codegen-project</name>
-    <version>2.2.3-SNAPSHOT</version>
-    <url>https://github.com/swagger-api/swagger-codegen</url>
+    <version>2.2.10-elastic-cloud</version>
+    <url>https://github.com/elastic/swagger-codegen</url>
     <scm>
-        <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
-        <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
-        <url>https://github.com/swagger-api/swagger-codegen</url>
+        <connection>scm:git:git@github.com:elastic/swagger-codegen.git</connection>
+        <developerConnection>scm:git:git@github.com:elastic/swagger-codegen.git</developerConnection>
+        <url>https://github.com/elastic/swagger-codegen</url>
     </scm>
     <prerequisites>
         <maven>2.2.0</maven>
@@ -28,7 +28,7 @@
     </developers>
     <issueManagement>
         <system>github</system>
-        <url>https://github.com/swagger-api/swagger-codegen/issues</url>
+        <url>https://github.com/elastic/swagger-codegen/issues</url>
     </issueManagement>
     <mailingLists>
         <mailingList>
@@ -846,8 +846,9 @@
     <modules>
         <module>modules/swagger-codegen</module>
         <module>modules/swagger-codegen-cli</module>
-        <module>modules/swagger-codegen-maven-plugin</module>
-        <module>modules/swagger-generator</module>
+        <!-- Commenting out modules that we don't currently need built -->
+        <!-- <module>modules/swagger-codegen-maven-plugin</module> -->
+        <!-- <module>modules/swagger-generator</module> -->
     </modules>
     <reporting>
         <outputDirectory>target/site</outputDirectory>
@@ -901,6 +902,18 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+    <distributionManagement>
+        <repository>
+            <id>central</id>
+            <name>cloud-release-local</name>
+            <url>https://artifactory.elastic.dev/artifactory/cloud-release-local</url>
+        </repository>
+        <snapshotRepository>
+            <id>snapshots</id>
+            <name>cloud-snapshot-local</name>
+            <url>https://artifactory.elastic.dev/artifactory/cloud-snapshot-local</url>
+        </snapshotRepository>
+    </distributionManagement>
     <repositories>
         <repository>
             <id>sonatype-snapshots</id>
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala
index 0db8a5c88e6..4a408cc6fa2 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala
@@ -36,12 +36,47 @@ import com.fasterxml.jackson.core.JsonGenerator.Feature
 import com.fasterxml.jackson.databind._
 import com.fasterxml.jackson.annotation._
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
+import com.fasterxml.jackson.databind.ser.std.StdSerializer
+import com.fasterxml.jackson.databind.ser.BeanSerializerModifier
+import com.fasterxml.jackson.databind.module.SimpleModule
+import com.fasterxml.jackson.core.JsonGenerator
+
+
+private class CustomSomeSerializer extends StdSerializer[Some[_]](classOf[Some[_]]) {
+  override def serialize(
+    value: Some[_],
+    gen: JsonGenerator,
+    provider: SerializerProvider
+  ): Unit = {
+    value match {
+      case Some(x) if x == null => provider.defaultSerializeNull(gen)
+      case Some(x) => provider.defaultSerializeValue(x, gen)
+    }
+  }
+}
+
+
+private class CustomModifier extends BeanSerializerModifier {
+  override def modifySerializer(
+    config: SerializationConfig,
+    beanDesc: BeanDescription,
+    serializer: JsonSerializer[_]
+  ): JsonSerializer[_] = {
+    beanDesc.getBeanClass match {
+      case c if c == classOf[Some[_]] => new CustomSomeSerializer
+      case _ => serializer
+    }
+  }
+}
 
 object ScalaJsonUtil {
   def getJsonMapper = {
     val mapper = new ObjectMapper()
+    val customModule = new SimpleModule("custom module")
+    customModule.setSerializerModifier(new CustomModifier)
     mapper.registerModule(new DefaultScalaModule())
     mapper.registerModule(new JodaModule());
+    mapper.registerModule(customModule)
     mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT)
     mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
@@ -63,6 +98,9 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
   def escape(value: String): String = {
     URLEncoder.encode(value, "utf-8").replaceAll("\\+", "%20")
   }
+  def escape(values: List[String]): String = {
+     values.map(escape).mkString(",")
+  }
 
   def escape(value: Long): String = value.toString
   def escape(value: Double): String = value.toString
@@ -151,7 +189,13 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
         else builder.`type`(contentType).put(classOf[ClientResponse], serialize(body))
       }
       case "DELETE" => {
-        builder.delete(classOf[ClientResponse])
+        if(body == null) builder.delete(classOf[ClientResponse])
+        else builder.`type`(contentType).delete(classOf[ClientResponse], serialize(body))
+      }
+      case "PATCH" => {
+        if(formData != null) builder.header("X-HTTP-Method-Override", "PATCH").post(classOf[ClientResponse], formData)
+        else if(body == null) builder.header("X-HTTP-Method-Override", "PATCH").post(classOf[ClientResponse], null)
+        else builder.header("X-HTTP-Method-Override", "PATCH").`type`(contentType).post(classOf[ClientResponse], serialize(body))
       }
       case _ => null
     }
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ApiResponse.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ApiResponse.scala
index a2badb49ae1..220a5e48d9e 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ApiResponse.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ApiResponse.scala
@@ -14,8 +14,8 @@ package io.swagger.client.model
 
 
 case class ApiResponse (
-  code: Option[Integer],
-  _type: Option[String],
-  message: Option[String]
+  code: Option[Integer] = None,
+  _type: Option[String] = None,
+  message: Option[String] = None
 )
 
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala
index e39d097b918..657b90de8a7 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala
@@ -14,7 +14,7 @@ package io.swagger.client.model
 
 
 case class Category (
-  id: Option[Long],
-  name: Option[String]
+  id: Option[Long] = None,
+  name: Option[String] = None
 )
 
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala
index a88c0ec23d9..c1a8965b93b 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala
@@ -15,12 +15,12 @@ package io.swagger.client.model
 import org.joda.time.DateTime
 
 case class Order (
-  id: Option[Long],
-  petId: Option[Long],
-  quantity: Option[Integer],
-  shipDate: Option[DateTime],
+  id: Option[Long] = None,
+  petId: Option[Long] = None,
+  quantity: Option[Integer] = None,
+  shipDate: Option[DateTime] = None,
   /* Order Status */
-  status: Option[String],
-  complete: Option[Boolean]
+  status: Option[String] = None,
+  complete: Option[Boolean] = None
 )
 
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala
index baabc18c99f..88c868637e9 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala
@@ -14,12 +14,12 @@ package io.swagger.client.model
 
 
 case class Pet (
-  id: Option[Long],
-  category: Option[Category],
+  id: Option[Long] = None,
+  category: Option[Category] = None,
   name: String,
   photoUrls: List[String],
-  tags: Option[List[Tag]],
+  tags: Option[List[Tag]] = None,
   /* pet status in the store */
-  status: Option[String]
+  status: Option[String] = None
 )
 
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala
index 5ae718fd7e8..ee39797b41c 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala
@@ -14,7 +14,7 @@ package io.swagger.client.model
 
 
 case class Tag (
-  id: Option[Long],
-  name: Option[String]
+  id: Option[Long] = None,
+  name: Option[String] = None
 )
 
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala
index c5bdb386638..46183e94547 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala
@@ -14,14 +14,14 @@ package io.swagger.client.model
 
 
 case class User (
-  id: Option[Long],
-  username: Option[String],
-  firstName: Option[String],
-  lastName: Option[String],
-  email: Option[String],
-  password: Option[String],
-  phone: Option[String],
+  id: Option[Long] = None,
+  username: Option[String] = None,
+  firstName: Option[String] = None,
+  lastName: Option[String] = None,
+  email: Option[String] = None,
+  password: Option[String] = None,
+  phone: Option[String] = None,
   /* User Status */
-  userStatus: Option[Integer]
+  userStatus: Option[Integer] = None
 )