Issue #28950: Merge 3.6.

diff --cc Misc/NEWS
index 5bf0f323961e371b86bc1a943dcac5c061d1f445,8fcdec5fd3695d296504530c3f077208815e4ad3..1aa0a7525f076960f115d7781439b72cccf6b2c7
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -627,27 -690,8 +627,30 @@@ Tools/Demo
  Tests
  -----
  
++- Issue #28950: Disallow -j0 to be combined with -T/-l in regrtest
++  command line arguments.
++
 +- Issue #28683: Fix the tests that bind() a unix socket and raise
 +  PermissionError on Android for a non-root user.
 +
 + - Issue #26936: Fix the test_socket failures on Android - getservbyname(),
 +   getservbyport() and getaddrinfo() are broken on some Android API levels.
 +
 +- Issue #28666: Now test.support.rmtree is able to remove unwritable or
 +  unreadable directories.
 +
 +- Issue #23839: Various caches now are cleared before running every test file.
 +
 +- Issue #26944: Fix test_posix for Android where 'id -G' is entirely wrong or
 +  missing the effective gid.
 +
 +- Issue #28409: regrtest: fix the parser of command line arguments.
 +
  - Issue #28217: Adds _testconsole module to test console input.
  
 +- Issue #26939: Add the support.setswitchinterval() function to fix
 +  test_functools hanging on the Android armv7 qemu emulator.
 +
  
  What's New in Python 3.6.0 beta 1
  =================================