# Conflicts:
#	apps/cli/executables/pexable/mediator/poetry.lock
#	apps/cli/executables/pexable/productfetcher/poetry.lock
#	apps/cli/executables/pexable/ws_annihilator/poetry.lock
#	apps/cli/executables/pexable/ws_annihilator/pyproject.toml
#	ci/unit-test.template.yml

fix a typo

See merge request !1671

add selfcal tar as image group ancillary when present

See merge request !1668

- updates for vela local testing file forging

Catchup with main

See merge request !1669

# Conflicts:
#	.bumpversion.toml
#	.gitlab-ci.yml
#	apps/cli/executables/go/spelunker/main.go
#	apps/cli/executables/pexable/carta_envoy/carta_envoy/__init__.py
#	apps/cli/executables/pexable/carta_envoy/pyproject.toml
#	apps/cli/executables/pexable/casa_envoy/casa_envoy/__init__.py
#	apps/cli/executables/pexable/casa_envoy/pyproject.toml
#	apps/cli/executables/pexable/conveyor/conveyor/__init__.py
#	apps/cli/executables/pexable/conveyor/pyproject.toml
#	apps/cli/executables/pexable/data_annotator/data_annotator/__init__.py
#	apps/cli/executables/pexable/data_annotator/pyproject.toml
#	apps/cli/executables/pexable/deliver/delivery/__init__.py
#	apps/cli/executables/pexable/deliver/pyproject.toml
#	apps/cli/executables/pexable/ingest_envoy/ingest_envoy/__init__.py
#	apps/cli/executables/pexable/ingest_envoy/pyproject.toml
#	apps/cli/executables/pexable/mediator/pyproject.toml
#	apps/cli/executables/pexable/mediator/system_mediator/__init__.py
#	apps/cli/executables/pexable/null/null/__init__.py
#	apps/cli/executables/pexable/null/pyproject.toml
#	apps/cli/executables/pexable/productfetcher/productfetcher/__init__.py
#	apps/cli/executables/pexable/productfetcher/pyproject.toml
#	apps/cli/executables/pexable/update_stage/pyproject.toml
#	apps/cli/executables/pexable/update_stage/update_stage/__init__.py
#	apps/cli/executables/pexable/vela/pyproject.toml
#	apps/cli/executables/pexable/vela/vela/__init__.py
#	apps/cli/executables/pexable/wf_inspector/pyproject.toml
#	apps/cli/executables/pexable/wf_inspector/wf_inspector/__init__.py
#	apps/cli/executables/pexable/ws_annihilator/pyproject.toml
#	apps/cli/executables/pexable/ws_annihilator/ws_annihilator/__init__.py
#	apps/cli/executables/pexable/ws_metrics/pyproject.toml
#	apps/cli/executables/pexable/ws_metrics/ws_metrics/__init__.py
#	apps/cli/utilities/aat_wrest/aat_wrest/__init__.py
#	apps/cli/utilities/aat_wrest/pyproject.toml
#	apps/cli/utilities/contacts_wrest/contacts_wrest/__init__.py
#	apps/cli/utilities/contacts_wrest/pyproject.toml
#	apps/cli/utilities/core_sampler/core_sampler/__init__.py
#	apps/cli/utilities/core_sampler/pyproject.toml
#	apps/cli/utilities/wf_monitor/poetry.lock
#	apps/cli/utilities/wf_monitor/pyproject.toml
#	apps/cli/utilities/wf_monitor/wf_monitor/__init__.py
#	services/capability/capability/__init__.py
#	services/capability/poetry.lock
#	services/capability/pyproject.toml
#	services/notification/notification/__init__.py
#	services/notification/poetry.lock
#	services/notification/pyproject.toml
#	services/workflow/gitlab-requirements.txt
#	services/workflow/poetry.lock
#	services/workflow/pyproject.toml
#	services/workflow/workflow/__init__.py
#	shared/messaging/messaging/__init__.py
#	shared/messaging/pyproject.toml
#	shared/workspaces/pyproject.toml
#	shared/workspaces/workspaces/__init__.py