Comment fix
Merge branch 'fredrik/ct/telnet_wo_line_breaks/OTP-10085' into maint
Merge branch 'lh/otp-optims/OTP-11035' into maint

* lh/otp-optims/OTP-11035:
  Use erlang:demonitor's flush option on timeout
  Don't lookup the node unless required in gen:call/{3,4}
Add testcase to exercise reconnect behaviour
Minor doc fix
fix srp_anon ciphers suites requiring certificates to work.

This problem was not caught by the test suites since all PSK and SRP
suites where always tested with certificates. Split those tests into
test with and without certificates.
Merge branch 'anders/diameter/address_config/OTP-10986' into maint

* anders/diameter/address_config/OTP-10986:
  Comment fix
  More robust listening port lookup in test suites
  Update example client to allow default local address
  Make explicit local address to diameter_tcp:start/3 optional
  Add transport interface 'connected' message with local address list
Merge branch 'anders/diameter/watchdog_leak/OTP-11019' into maint

* anders/diameter/watchdog_leak/OTP-11019:
  Minor doc fix
  Add testcase to exercise reconnect behaviour
  Fix watchdog table leak
Add more information to traffic suite timeout failures

In particular, have the resulting badmatch contain the starting and
ending time. There are still sporadic failures on slow hosts.
Optimize index creation for Mnesia set tables

ETS bag tables have very poor performance on insertion if you have lots
of rows with duplicate keys, since it has to check each existing record
and make sure it's not inserting any duplicates. This can lead to some
pretty drastic slowdowns when inserting lots of rows into an Mnesia
table, IF you're introducing lots of duplicate values into an indexed
column.

As it turns out, we can fix this by switching to duplicate_bag tables
for storing Mnesia indexes on tables of type 'set', and it ultimately
makes no functional difference since we will never actually attempt to
insert any duplicate records anyway. (We would have to make some bigger
changes to make this work for Mnesia bag tables though, so that is left
as a possible enhancement for the future.)
Lighten up on suite timetraps

Due to sporadic timeouts one some (slow) hosts.
Add gen_tcp suite

This is initially to identify the source of some flakiness on Windows.
Minor traffic suite fix

Point was to test that Session-Id was not undefined. Instead, test case
send_error just returned false.
inets: stop block timer with the right arguments
Merge branch 'nox/file-receive-optim/OTP-11040' into maint

* nox/file-receive-optim/OTP-11040:
  Optimize communication with file io server
Merge branch 'lh/demonitor-flush/OTP-11039' into maint

* lh/demonitor-flush/OTP-11039:
  Use erlang:demonitor(Ref, [flush]) where applicable
Merge branch 'jaf/fix-supervisor-multi-restart/OTP-11042' into maint
Merge branch 'bjorn/asn1/fix-lost-extension-mark/OTP-10995' into maint-r15

* bjorn/asn1/fix-lost-extension-mark/OTP-10995:
  Prevent loss of objects after the extension marker
  Don't lose the extension mark for object set parameters
Prepare release
erts: Fix locking order violation for allocation wrappers

Some query functions in erl_alloc_util.c lock the allocator mutex
and then use erts_printf that in turn may call the sys allocator
through the wrappers. To avoid breaking locking order these
query functions first "pre-locks" all allocator wrappers.