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 so
that `with logging._lock:` is sufficient; that PR made it into Python
3.7, which is already pastescript's minimum Python requirement.

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

Aquire the logging lock using the underlying _lock object from the
logging module.

As of python/cpython#3385, included in Python 3.7, this object an instance
of threading.RLock whose use as a context manager with release being
called when the block exits, see
https://docs.python.org/3/library/threading.html#using-locks-conditions-and-semaphores-in-the-with-statement

* aquire logging lock using _lock context manager

Aquire the logging lock using the underlying _lock object from the
logging module.

As of python/cpython#3385, included in Python 3.7, this object an instance
of threading.RLock whose use as a context manager with release being
called when the block exits, see
https://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>