Resolve conflicts:a6a4dc8 bpo-31370: Remove support for threads-less builds (python#3385)

* Remove Setup.config* Always define WITH_THREAD for compatibility.

python/cpython#109462 removed`logging._acquireLock`.  Fortunately,python/cpython#3385 simplified lock creation sothat `with logging._lock:` is sufficient; that PR made it into Python3.7, which is already pastescript's minimum Python requirement.

python/cpython#109462 removed`logging._acquireLock`.  Fortunately,python/cpython#3385 simplified lock creation sothat `with logging._lock:` is sufficient; that PR made it into Python3.7, which is already pastescript's minimum Python requirement.

Aquire the logging lock using the underlying _lock object from thelogging module.As ofpython/cpython#3385, included in Python 3.7, this object an instanceof threading.RLock whose use as a context manager with release beingcalled when the block exits, seehttps://docs.python.org/3/library/threading.html#using-locks-conditions-and-semaphores-in-the-with-statement

* aquire logging lock using _lock context managerAquire the logging lock using the underlying _lock object from thelogging module.As ofpython/cpython#3385, included in Python 3.7, this object an instanceof threading.RLock whose use as a context manager with release beingcalled when the block exits, seehttps://docs.python.org/3/library/threading.html#using-locks-conditions-and-semaphores-in-the-with-statement* mark conda.common.io._logger_lock for deprecation* add news* Update news/14584-use-logging-lock* Apply suggestions from code review---------Co-authored-by: Daniel Holth <dholth@anaconda.com>Co-authored-by: Ken Odegard <kodegard@anaconda.com>