* pg/fix-zip-multidisk/OTP-10223:
  Fix bug where zip archives wrongly have a first disk number set to 1

Column numbers was merged without understanding all the whole
story. See mail on erlang-patches for details.

This reverts commit df8e67e203b83f95d1e098fec88ad5d0ad840069, reversing
changes made to 0c9d90f314f364e5b1301ec89d762baabc57c7aa.

* jkl/fix-filename-nativename/OTP-10188:
  Fix filename:nativename/1 on Win32
  Add filename:nativename/1 binary argument test to suite

Commit df8e67e203b83f95d1e098fec88ad5d0ad840069 broke
"./otp_build update_primary" because epp:parse_file/4 was
added and used from the compiler, but the epp module is not part
of the primary compiler that is used to compile the bootstrap
compiler. Fix the problem by including the epp module in the
primary compiler.

* bjorn/compiler/minor-fixes/OTP-10185:
  erl_lint: Add a deprecated warning for literal tuple funs
  beam_utils:live_opt/1: Correct handling of try_case_end/1
  Correct guard_SUITE_tuple_size.S
  beam_type: Print the offending function if this pass crashes
  beam_validator: Validate the size operand in bs_init_bits and bs_init2

The run-time warning for use of tuple funs will not catch the use
of literal tuple funs, such as:

    if
	{erlang,'+'}(3,X) =:= 0 -> true;
	true -> false
    end.

Therefore, add a compile-time warning to give users some warning
before they stop working in R16.

* nox/compile-column-numbers:
  Fix messages ordering with column numbers
  Fix type compile:err_info/0
  Test column number reporting in error_SUITE
  Fix printing of errors with column numbers
  Create a new "column" option in compile
  Allow setting of initial position in epp
  Export type erl_scan:location/0

Don't choke on paths given as binary argument on Win32.

* 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