Merge branch 'mh/supervisor-doc/OTP-10938' into maint

* mh/supervisor-doc/OTP-10938:
  Delete obsolete note about simple-one-for-one supervisor
Merge branch 'dg/win_icon' into pu
Merge branch 'sk/odbc64' into pu
Merge branch 'rc/break-out-asserts' into pu
Merge branch 'sm/fix-disksup-susv3' into pu
Merge branch 'pn/error-logger-sup_handler' into pu
Merge branch 'xc/inets-httpc-patches' into pu
Merge branch 'ks/hipe-cleanup' into pu
Merge branch 'as/tls-psk-srp-suites-ECC' into pu

Conflicts:
	lib/public_key/src/pubkey_cert.erl
	lib/ssl/src/ssl_certificate.erl
	lib/ssl/src/ssl_cipher.erl
Merge branch 'ks/hipe-cleanup-escaping' into pu
Merge branch 'ks/erlang-spawn_opt-process_level' into pu
Update preloaded modules