* dgud/testcase_fixes:
  Fix timers
  mnesia: Decrease test times
  Add debug printouts
  wx: Fix failing testcases
  stdlib: Ignore symlink tests on windows

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.

Symlinks only partially works on windows 7, ignore those tests
on windows machines for now

According to the documentation, if the second or third line in a
script starts with %%!, then escript will use the rest of the line
as emulator options.  However, previously this was only the case
if the first line started with #!.  This change removes that check,
and unconditionally uses the %%! line if present.

Expect modifications, additions and corrections.

There is a kludge in file_io_server and
erl_scan:continuation_location() that's not so pleasing.

When correcting OTP-10071, a new error was introduced in
erl_prim_loader. In order to improve ability to detect if a file was
inside the primary archive, all paths were flattened - i.e. "."  and
".." were removed. This implementation had some faults, and it did not
take symlinks into account. This has been corrected.

* ta/prim_archive-reloading:
  escript_SUITE: remove gratuitous space
  [erts,kernel,stdlib] fix escript/primary archive reloading

Conflicts:
	erts/preloaded/src/erl_prim_loader.erl

OTP-10151

Thanks to Tuncer Ayaz for co-authoring.