Drop buildbottouch again; the master is using "make touch" now.
Issue #19147: Fix docstring for fcntl.flock to refer to correct man section.
Issue #18037: 2to3 now escapes '\u' and '\U' in native strings.