resolving SSA-6324-df-pytest-docker merge conflicts

apps/cli/executables/datafetcher/setup.cfg

apps/cli/executables/datafetcher/setup.py

...xecutables/datafetcher/src/datafetcher/file_retrievers.py

...ecutables/datafetcher/src/datafetcher/locations_report.py

...ecutables/datafetcher/src/datafetcher/product_fetchers.py

.../cli/executables/datafetcher/src/datafetcher/utilities.py

apps/cli/executables/datafetcher/test-requirements.txt

apps/cli/executables/datafetcher/test/Dockerfile

apps/cli/executables/datafetcher/test/datafetcher_test.py

apps/cli/executables/datafetcher/test/docker-build.sh

...cli/executables/datafetcher/test/locations_report_test.py

apps/cli/executables/datafetcher/test/logging_test.py

apps/cli/executables/datafetcher/test/retriever_test.py

apps/cli/executables/datafetcher/test/testing_utils.py

apps/cli/executables/datafetcher/tox.ini