Merge branch 'master' of https://github.com/tomakehurst/wiremock into rotating-request-journal

Conflicts:
	docs/source/getting-started.rst
	src/main/java/com/github/tomakehurst/wiremock/core/WireMockConfiguration.java