Conflicts:
	.gitlab-ci.yml
	CMakeIncludes/dependencies.cmake
	common/cpp/CMakeLists.txt
	consumer/api/cpp/src/tcp_consumer_client.cpp
	deploy/asapo_services/Dockerfile
	deploy/asapo_services/Dockerfile.in
	deploy/asapo_services/asap3.tfvars
	deploy/asapo_services/scripts/asapo-brokers.nmd.tpl
	deploy/asapo_services/scripts/asapo-fts.nmd.tpl
	deploy/asapo_services/scripts/asapo-receivers.nmd.tpl
	deploy/asapo_services/scripts/asapo-services.nmd.tpl
	deploy/asapo_services/scripts/asapo.auto.tfvars.in
	deploy/asapo_services/scripts/templates.tf