Automated merge with file:///Users/skumaran/python/cpython
Issue #18784: The uuid module no more attempts to load libc via ctypes.CDLL,
if all necessary functions are already found in libuuid.
Patch by Evgeny Sologubov.
Issue #18784: The uuid module no more attempts to load libc via ctypes.CDLL,
if all necessary functions are already found in libuuid.
Patch by Evgeny Sologubov.
Fix http.server's request handling case on trailing '/'.

Patch contributed by Vajrasky Kok. Addresses Issue #17324
Fix http.server's request handling case on trailing '/'.

Patch contributed by Vajrasky Kok. Addresses Issue #17324
Issue #18818: The "encodingname" part of PYTHONIOENCODING is now optional.
Issue #18945: Add tests for tempfile name collision handling.

Patch by Vlad Shcherbina
Issue #18945: Add tests for tempfile name collision handling.

Patch by Vlad Shcherbina
Issue #18997: fix ElementTree crash with using pickle and __getstate__.

Based on report and initial patch from Germ?n M. Bravo
Add Germ?n M. Bravo to Misc/ACKS
Merge for Issue #18997: Issue #18997: fix ElementTree crash with using pickle and __getstate__.
Issue #16201: socket: Use inet_pton()/inet_addr() instead of ad-hoc parsing for
numeric IP addresses.
#18951: use consistent names in unittest docs.
#18951: merge with 3.3.
#18981: fix a typo in a comment (noticed by Anoop Thomas Mathew).
Issue #18955: clarify what is removed by importlib.util.module_for_loader.
#18981: merge with 3.3.
Issue #19013: add unittest.main() epilogs to unittest's own test modules
Issue #19013: add unittest.main() epilogs to unittest.mock's own test modules