Issue #22289: merge from 3.4

diff --cc Lib/test/support/__init__.py
Simple merge

diff --cc Misc/NEWS
index cc8e20ad2cab271b2aff72b1bf180d25d5ab7013,46c3c0a66adca043e3bc023f6ed8ad02fcf857ef..072c8748169756f2850750324941b5f680b74787
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -95,51 -47,6 +95,56 @@@ Librar
  - Issue #23615: Modules bz2, tarfile and tokenize now can be reloaded with
    imp.reload().  Patch by Thomas Kluyver.
  
 +- Issue #23605: os.walk() now calls os.scandir() instead of os.listdir().
 +  The usage of os.scandir() reduces the number of calls to os.stat().
 +  Initial patch written by Ben Hoyt.
 +
 +Build
 +-----
 +
 +- Issue #23585: make patchcheck will ensure the interpreter is built.
 +
++Tests
++-----
++
++- Issue #22289: Prevent test_urllib2net failures due to ftp connection timeout.
++
 +Tools/Demos
 +-----------
 +
 +- Issue #22826: The result of open() in Tools/freeze/bkfile.py is now better
 +  compatible with regular files (in particular it now supports the context
 +  management protocol).
 +
 +
 +What's New in Python 3.5 alpha 2?
 +=================================
 +
 +Release date: 2015-03-09
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #22980: Under Linux, C extensions now include bitness in the file
 +  name, to make it easy to test 32-bit and 64-bit builds in the same
 +  working tree.
 +
 +- Issue #23571: PyObject_Call() and PyCFunction_Call() now raise a SystemError
 +  if a function returns a result and raises an exception. The SystemError is
 +  chained to the previous exception.
 +
 +Library
 +-------
 +
 +- Issue #22524: New os.scandir() function, part of the PEP 471: "os.scandir()
 +  function -- a better and faster directory iterator". Patch written by Ben
 +  Hoyt.
 +
 +- Issue #23103: Reduced the memory consumption of IPv4Address and IPv6Address.
 +
 +- Issue #21793: BaseHTTPRequestHandler again logs response code as numeric,
 +  not as stringified enum.  Patch by Demian Brecht.
 +
  - Issue #23476: In the ssl module, enable OpenSSL's X509_V_FLAG_TRUSTED_FIRST
    flag on certificate stores when it is available.