gh-138162: Fix logging.LoggerAdapter with merge_extra=True and without the extra argument#140511

serhiy-storchaka merged 3 commits intopython:mainpython/cpython:mainfrom

serhiy-storchaka:logging-LoggerAdapter-merge_extra-without-extraserhiy-storchaka/cpython:logging-LoggerAdapter-merge_extra-without-extraCopy head branch name to clipboard