Fix a typo in erts/lib_src/Makefile.in
Document output.mk.in

Conflicts:

	make/output.mk.in
Merge branch 'sverk/r16/utf8-atoms'

* sverk/r16/utf8-atoms:
  erl_interface: Fix bug when transcoding atoms from and to UTF8
  erl_interface: Changed erlang_char_encoding interface
  erts: Testcase doing unicode atom printout with ~w
  erl_interface: even more utf8 atom stuff
  erts: Fix bug in analyze_utf8 causing faulty latin1 detection
  Add UTF-8 node name support for epmd
  workaround...
  Fix merge conflict with hasse
  UTF-8 atom documentation
  test case
  erl_interface: utf8 atoms continued
  Add utf8 atom distribution test cases
  atom fixes for NIFs and atom_to_binary
  UTF-8 support for distribution
  Implement UTF-8 atom support for jinterface
  erl_interface: Enable decode of unicode atoms
  stdlib: Fix printing of unicode atoms
  erts: Change internal representation of atoms to utf8
  erts: Refactor rename DFLAG(S)_INTERNAL_TAGS for conformity

Conflicts:
	erts/emulator/beam/io.c

OTP-10753
Merge branch 'sverk/opt-timer-wheel2'

* sverk/opt-timer-wheel2:
  erts: Fixate timer wheel resultion at compile time if possible
ssl: Remove unnecessary construction of a return value
ssl: M-x erlang-indent-buffer
ssl: Do not return random values
ssl: Enhance dialyzer specs
Bump fewer vreds per task callback
Merge branch 'rickard/r16/port-optimizations/OTP-10336'

* rickard/r16/port-optimizations/OTP-10336:
  Bump fewer vreds per task callback
Make it possible to execute one test run per test specification

OTP-9881
Implement support for including test specifications

OTP-9881
Update CT Master

OTP-9881
Add tests and correct errors

OTP-9881
Remove vestiges of support for the {TypeName,Value} notation

Support in BER was removed in 3d1279f3cebfdd2483c3afea9f225613fe45cd00.
Don't export encode_disp/2 and decode_disp/2 in generated modules

Those functions were exported for no good reason.
Merge branch 'bjorn/warnings-zero-tolerance'

* bjorn/warnings-zero-tolerance:
  Turn warnings to errors on selected applications
  runtime_tools_sup: Eliminate warning
  inet_parse: Eliminate a compiler warning
Merge branch 'bjorn/kernel/undefined-function-handler/OTP-10617'

* bjorn/kernel/undefined-function-handler/OTP-10617:
  Add a warning to discourage abuse of $handle_undefined_function/2
Changed to correct errorcode in testcase
Merge branch 'kp/odbc-oracle-autocommit-fix/OTP-10735'

* kp/odbc-oracle-autocommit-fix/OTP-10735:
  Fix aotocommit for Oracle ODBC driver in Linux.