Merge pull request #243 from wolfgangmm/develop

[ignore] JMXServlet can use JMX to find the data dir ;-)
General code improvements
Merge pull request #244 from dizzzz/feature/Improve_contentextract_code

General code improvements Content extraction
Merge pull request #245 from wolfgangmm/develop

Update JMX servlet
This is the configuration of ivy.xml for content extraction module that
throws no error on starting eXist, after building.
Merge pull request #247 from claudius108/develop

This is the configuration of ivy.xml for content extraction module that
Merge pull request #249 from wolfgangmm/develop

self:: axis bug fix
SMall change to make free-diskspace check consistent: two calls can return two different values
Merge pull request #253 from wolfgangmm/develop

Fix .war build and tomcat 8 support
Merge branch 'develop' of github.com:eXist-db/exist into develop
Merge pull request #257 from dizzzz/develop

Improve measuring minFreeDiskSpace code
* updated betterFORM to version 5.RC7 (switched from ehcache to infinispan, fixed tomcat 8 issues)
Merge pull request #258 from wolfgangmm/develop

[bugfix] Prevent concurrency issue in XQueryURLRewrite