Issue #21280: Fixed a bug in shutil.make_archive() when create an archive of

current directory in current directory.

diff --cc Lib/shutil.py
Simple merge

diff --cc Lib/test/test_shutil.py
Simple merge