Correct a disk_log testcase
Adjust dets.erl to cope with an evil test case

The test case deletes a Dets process while it is repairing a file.
Another client waiting for the Dets process to reply then kicks in and
repairs the file. Apparently the temporary file was still open,
resulting in an eacces error on Windows.
Remove ?line from dets_SUITE.erl
Fix a test case bug

io_proto_SUITE: node names containing some '-' did not work.
Fix a test case bug

shell_SUITE: Calling i() did not work because if there are more than
100 processes c:i() will go into pager mode, asking for input.
Fix a test case

interactive_shell_SUITE: nodes names with '-'
Fix a test case

The application/module 'gs' is not available on all platforms.
Merge branch 'maint'
Merge branch 'anders/diameter/distribution/OTP-9610' into maint

* anders/diameter/distribution/OTP-9610:
  Specify timeouts to ct_slave:start/2
  More flexible distribution config
  Add distribution suite
  Document distribution config
  Distribution fixes
Merge branch 'maint'
Merge branch 'hb/test_case_corrections' into maint

* hb/test_case_corrections:
  Fix a test case
  Fix a test case
  Fix a test case bug
  Fix a test case bug
  Remove ?line from dets_SUITE.erl
  Adjust dets.erl to cope with an evil test case
  Correct a disk_log testcase
Merge branch 'maint'

* maint:
  Fix a test case
  Fix a test case
  Fix a test case bug
  Fix a test case bug
  Remove ?line from dets_SUITE.erl
  Adjust dets.erl to cope with an evil test case
  Correct a disk_log testcase
Minor capx suite fix
Merge branch 'jb/ssl/fix-ssl-npn-doc/OTP-10955' into maint

* jb/ssl/fix-ssl-npn-doc/OTP-10955:
  Fix SSL Next Protocol Negotiation documentation
Merge branch 'maint'
Merge branch 'ia/inets/cookie-bug/OTP-10956' into maint

* ia/inets/cookie-bug/OTP-10956:
  inets httpc: Revert incorrect commit regarding cookie handling.
Merge remote branch 'upstream/maint'
Let escript recognize an encoding comment on the second line

The manual says that an Emacs directive can be placed on the second
line. With this patch that directive is also recognized when selecting
encoding of the script.
Merge branch 'hb/stdlib/escript_unicode/OTP-10951' into maint

* hb/stdlib/escript_unicode/OTP-10951:
  Let escript recognize an encoding comment on the second line
Merge branch 'maint'

* maint:
  Let escript recognize an encoding comment on the second line