Merge branch 'weisslj/fix-httpd-timeout-options/OTP-11276' into maint

* weisslj/fix-httpd-timeout-options/OTP-11276:
  inets: added testcase for keep_alive_timeout
  Add test for httpd config option 'script_timeout'
  Fix httpd config option 'script_timeout'
  Fix httpd config option 'keep_alive_timeout'
Merge branch 'maint'
public_key: change encoding to utf8
Merge branch 'fredrik/public_key/convert_to_utf8' into maint

* fredrik/public_key/convert_to_utf8:
  public_key: change encoding to utf8
Merge branch 'maint'
Add iodata, nonempty_string to built-in type highlighting for emacs

These built-in types were missing from emacs highlighting
Use normal- instead of scaled timeouts in test case
Merge branch 'larshesel/fix-bsr-bug/OTP-11381' into maint

* larshesel/fix-bsr-bug/OTP-11381:
  Fix bsr bug
  Add bsr test data showing bug when shifting large numbers
Merge branch 'maint'
wx: Fix initializations on mac osx

Remove dummy windows and move the console to gui app code before
wxWidgets gets initialized to prevent hangings on current wxWidgets svn
version.
Merge branch 'ali/fix-inet-typespec/OTP-11377' into maint

* ali/fix-inet-typespec/OTP-11377:
  Fix the typespec for the inet:ifget/2 and inet:ifget/3 return value
Merge branch 'maint'
[snmp] Add (atl) log conversion block option

It is now possible to request that the Audit Trail Log should
be blocked during conversion (log_to_txt or log_to_io). This
could be usefull when coverting a large log (when there is
a chance it may otherwise wrap during conversion).
Merge branch 'bjorn/observer/fix-doc-bug/OTP-11335' into maint

* bjorn/observer/fix-doc-bug/OTP-11335:
  Documentation of tracer/2: Use the correct option name 'overload_check'
Merge branch 'maint'

* maint:
  Documentation of tracer/2: Use the correct option name 'overload_check'
[snmp] Updated release notes, ref man, appup and assigned proper version
Merge branch 'bmk/snmp/blocking_log_during_conversion' into bmk/snmp/snmp425_integration

Conflicts:
	lib/snmp/doc/src/notes.xml
	lib/snmp/src/app/snmp.erl
[snmp] Commented out (currently) unused upgrade/downgrade function
common_test: added code_change/3 for gen_event behaviour
Change 'recive' to 'receive' in gen_server.erl

A small spelling correction merely; no functionality change.