* peterdmv/inets/httpd_erl_script_timeout/ERIERL-321/OTP-15669:
  inets: Fix handling of erl_script_timeout

Change-Id: I6a90408de48df6b8b01f44e0b273507bcec27b13

When httpd was started with 'erl_script_timeout', the value of the
option was converted to milliseconds before storage. Subsequent
calls to httpd:info/1 returned the input value multiplied by 1000.

This change fixes the handing of erl_script_timeout by storing the
timeout in seconds and converting it to milliseconds before usage.

Change-Id: Ic308d83b59ad0884e053f096f995754c89adcbf4

* sverker/maint/ets-no-mbuf-trapping/OTP-15660:
  erts: Remove ets traversal yielding if heap fragment

* anders/diameter/21.3/OTP-15654:
  Update appup for diameter 2.2 in OTP 21.3

* anders/diameter/distribution/OTP-15398:
  Add diameter_dist_SUITE to exercise diameter_dist:route_session/2
  Add consistent hashing to diameter_dist:route_session/2
  Add options to diameter_dist:route_session/2 node selection
  Add diameter_dist for ready spawn_opt callbacks
  Tweak/document request handler callback
  Document acknowledgements in transport interface
  Fix comment typo

* ingela/ssl/ftp/continue/chunk-timing/ERIERL-316/OTP-15666:
  ssl: Correct active once emulation
  ftp: New test case

* siri/logger/file-logging-improvements:
  [logger] Add option file_check to logger_std_h
  [logger] Add log file rotation by options to logger_std_h
  [logger] Add better control of file modes in logger_std_h
  [logger] Refactor logger_std_h
  [logger] Make sure log file is re-opened with configured file options

OTP-15663

This option indicates how often the handler shall check if the log
file still exists and if the inode is changed.