Conflicts:
	erts/doc/src/notes.xml
	erts/emulator/drivers/common/inet_drv.c
	erts/vsn.mk
	lib/kernel/test/gen_sctp_SUITE.erl

* sverker/stub-module-code-leakage:
  Prevent valgrind warning for erts_alloc_permanent_cache_aligned
  [erts] Fix memory leak in erts_make_stub_module (hipe loading)

* lukas/fix_erts_testcases/OTP-9596:
  Skip create_big_boot on platforms without crypto
  Remove test_server path instead of cwd for clash test
  Skip getaddr_v6 test if on the ipv4_only host
  Use static port for old solaris versions
  Extend time to wait for zone files to be loaded
  Allow out of memory exception for max_port checks
  Extend slave start timeout for windows tests
  Double timeout to make sure debug builds pass
  Use now instead of os:timestamp
  Increase timeout in scheduler_suspend for slow platforms
  Skip update_cpu_info if 'taskset' cannot be found

This is done in order to improve timing when testing
debug builds, especially ppc debug builds.