#16852: test_genericpath, test_posixpath, test_ntpath, and test_macpath now work with unittest test discovery.  Patch by Zachary Ware.
#16852: merge with 3.3.
Use correct methods in unittest.mock examples.
Merge unittest.mock examples fixes.