Add wabisabi to Scala clients.
_default_ mapping not applied when using separate master/data nodes
fixes #4124
Unable to create a nested filtered alias on a dataless master
fixes #4112
Added support for external query in postings highlighter

It is now possible to highlight an external query using the postings highlighter, relates to #3630

Closes #4121
In ctor of GeoPointFieldMapper, geohash_prefix now implicitly enables geohash option
Also improved docs for geopoint type and geohash_cell filte

Closes #3951
fix issues with JAVA_OPTS/ES_JAVA_OPTS in service.bat

fix handling of non-empty JAVA_OPTS
remove usage of if/else that can be tripped by parenthesis in the variable
fixes #4127
closes #4086

(cherry picked from commit fb44e9aef76026f2269f1fdc8832a44f8c76ec8f)
Package test-framework as individual jar

This commit causes all classes under 'org.elasticsearch.test.*'
to be included in a 'elasticsearch-${version}-test.jar' that can be
inclued by 3rd party projects or plugins via:

```
 <dependency>
    <groupId>org.elasticsearch</groupId>
    <artifactId>elasticsearch</artifactId>
    <version>${elasticsearch.version}</version>
    <type>test-jar</type>
    <scope>test</scope>
 </dependency>
```