Merge branch 'maint-r15' into maint

* maint-r15:
  Update release notes
  vsn -> 1.3.1
  Update appup
  Traffic suite comments plus a minor match tweak
  Add a testcase
  Reverse swapped arguments
  Prepare release
  Fixed syntax appup ssh
Update sasl.appup.src with R16 release and remove R13 versions
Revert "Prepare release"

This reverts commit a0e362765d9d4afb0211f49eb787d2139b3eb7be.
Merge branch 'maint-r15' into maint
asn1_SUITE: Mend broken test_modified_x420/1

The test_modified_x420/1 test case had several problems that
prevented it to detect the bugs it was supposed to find:

1) There was a 'catch' at the top-level so that it could never fail.
2) There was a call to the now non-existing ssl_base64 module.
3) It did not test all options for the BER backend.

While at it, also clean way the remaining ?line macros and some
out-commented code.
asn1_erl_nif: Correct broken length encoding

The ber_bin_v2 backend calls a NIF function to decode all tags
and lengths. Even open types that should not be decoded will also be
decoded, which makes it necessary to later re-encode the data using
a NIF function.

The NIF function incorrectly encoded lengths.
[test_server] Don't write unicode strings to latin1 log files

The unicode update of test_server for R16A introduced a few potential
errors when logging to files. Sometimes ~tp or ~ts was used for
formatting also when writing to files that were not opened with the
{encoding,utf8} option. If then the argument contained unicode
characters above 255, the file descriptor would crash. This has been
corrected by the following modifications:

* Since the 'unexpected_io' log file is used only when the test case
  HTML file is not available (e.g. between test cases), this file is
  now also a HTML file and as other test_server HTML logs it is always
  UTF-8 encoded

* Since it is possible to change which information is going to which
  log file (with test_server_ctrl:set_levels/3), we do not have full
  control over which information is written to which file. This means
  that any printout could be written to the 'major' log file
  (suite.log), which was earlier encoded as latin1. To avoid crashing
  this file descriptor due to unicode strings, the 'major' log file is
  now also encoded in UTF-8 (possible incopatibility).

* The cross_cover.info file is no longer a text file which can be read
  with file:consult/1, instead it is written as a pure binary file
  using term_to_binary when writing and binary_to_term when reading.

* The encoding of the file named 'last_name', which only content is
  the path to the last run.<timestamp> directory, is now dependent on
  the file name mode of the VM. If file names are expected to be
  unicode, then the 'last_name' file is UTF-8 encoded, else it is
  latin1 encoded.

Also, ~tp is changed back to ~p unless it is somehow likely that the
argument includes strings. It is not obvious that this is the correct
thing to do, but some decission had to be taken...
testX420: Pass Options to the ASN.1 compiler

When the caller passed the 'der' option, it was ignored.
Don't run testX420/1 on old slow Sparc systems

One and a half hour is not enough for it to finish.
Merge branch 'bjorn/asn1/test-cases' into maint-r15

* bjorn/asn1/test-cases:
  Don't run testX420/1 on old slow Sparc systems
  testX420: Pass Options to the ASN.1 compiler
Merge branch 'bjorn/asn1/extension-addition-groups/OTP-10811' into maint-r15

* bjorn/asn1/extension-addition-groups/OTP-10811:
  Fix a bug for multiple extension addition groups
Merge branch 'bjorn/asn1/open-type-error/OTP-10805' into maint-r15

* bjorn/asn1/open-type-error/OTP-10805:
  asn1_erl_nif: Correct broken length encoding
  asn1_SUITE: Mend broken test_modified_x420/1
Prepare release
[test_server] Add error printouts in case writing to test case html log fails

Errors are printed to unexpected_io log.
Merge branch 'maint-r15' into maint

* maint-r15:
  Prepare release
  Don't run testX420/1 on old slow Sparc systems
  testX420: Pass Options to the ASN.1 compiler
  asn1_erl_nif: Correct broken length encoding
  asn1_SUITE: Mend broken test_modified_x420/1
  Fix a bug for multiple extension addition groups
Merge branch 'maint'

* maint:
  Prepare release
  Don't run testX420/1 on old slow Sparc systems
  testX420: Pass Options to the ASN.1 compiler
  asn1_erl_nif: Correct broken length encoding
  asn1_SUITE: Mend broken test_modified_x420/1
  Revert "Prepare release"

Conflicts:
	lib/asn1/doc/src/notes.xml
	lib/asn1/test/asn1_SUITE.erl
Merge branch 'siri/sasl/appup-R16/OTP-10806'

* siri/sasl/appup-R16/OTP-10806:
  Update sasl.appup.src with R16 release and remove R13 versions
Merge branch 'siri/ts-and-tp-in-test-logs/OTP-10780'

* siri/ts-and-tp-in-test-logs/OTP-10780:
  [test_server] Add error printouts in case writing to test case html log fails
  [test_server] Don't write unicode strings to latin1 log files
Merge branch 'dg/win_icon' into master-pu
Merge branch 'sk/odbc64' into master-pu