* lukas/compiler/add_to_dis/OTP-14784:
  compiler: Add +to_dis option that dumps loaded asm

* lukas/docs/xmllint_fixes/OTP-14721:
  ssl/ssh: Remove/ignore unused XML_FILES doc files
  Refactor xmllint check and make it fail on failure
  Add toplevel xmllint make target

Conflicts:
	lib/crypto/doc/src/Makefile

* maint-18:
  Updated OTP version
  Prepare release
  ssh: Unicode encoding fix
  ssh: testcases for space trailing Hello msg
  Remove unused test include file from test suites
  eldap: Repair Makefile
  ssh: Don't remove trailing WS in Hello msg

Conflicts:
	OTP_VERSION
	erts/doc/src/notes.xml
	erts/vsn.mk
	lib/compiler/doc/src/notes.xml
	lib/compiler/vsn.mk
	lib/crypto/test/blowfish_SUITE.erl
	lib/eldap/doc/src/notes.xml
	lib/eldap/vsn.mk
	lib/inets/test/httpd_load.erl
	lib/inets/test/httpd_mod.erl
	lib/inets/test/old_httpd_SUITE.erl
	lib/ssh/doc/src/notes.xml
	lib/ssh/vsn.mk
	lib/stdlib/test/zip_SUITE.erl
	otp_versions.table

* john/compiler/fail-labels-in-blocks-otp-18/ERIERL-48/OTP-14522:
  compiler: Fix live regs update on allocate in validator
  Take fail labels into account when determining liveness in block ops

The compiler option 'deterministic' was only recognized when given
as an option to the compiler, not when it was specified in a
-compile() attribute in the source file.

https://bugs.erlang.org/browse/ERL-498

This commit also adds a check to see that all files that
are part of an xi:include also have part of XML_FILES
and vice versa. It also fixes any applications where this
was not true.