post-rebase conflict resolution #5670

Job	Run time
clippy-aries-vcx	3m 44s
workflow-setup	26s
check-aries-vcx-feature-variants	4m 10s
check-did-resolver-feature-variants	2m 50s
verify-code-formatting	19s
test-unit-workspace (anoncreds_vdrtools)	7m 20s
test-unit-workspace (anoncreds_credx)	7m 14s
test-integration-aries-vcx-migration	15m 47s
build-docker-vdrproxy	17s
test-integration-aries-vcx (vdrtools)	15m 48s
test-integration-aries-vcx (modular_libs)	15m 46s
code-coverage-aries-vcx-integration-modular-libs	15m 48s
test-integration-aries-vcx-mysql	6m 0s
test-integration-libvcx (anoncreds_vdrtools)	6m 33s
test-integration-libvcx (anoncreds_credx)	6m 16s
workflow-setup-check	2s
x86_64-unknown-linux-gnu	5m 4s
x86_64-unknown-linux-musl	8m 23s
x86_64-apple-darwin	6m 53s
aarch64-apple-darwin	15m 43s
test-integration-node-wrapper (18.x)	8m 13s
test-integration-resolver	3m 16s
test-node-wrapper (18.x)	4m 23s
test-integration-aries-vcx-vdrproxy	15m 22s
publish-docker-vdrproxy	6s
make-release	1s
publish-napi	1s
publish-node-wrapper	1s
publish-agent-core	1s
	2h 55m 47s

Provide feedback