L2SS-398: merge with master and fix conflicts

.gitlab-ci.yml

docker-compose/.env

docker-compose/archiver-timescale.yml

docker-compose/archiver.yml

docker-compose/timescaledb/Dockerfile

docker-compose/timescaledb/README.md

docker-compose/timescaledb/resources/01_admin.sql

docker-compose/timescaledb/resources/02_hdb_schema.sql

docker-compose/timescaledb/resources/03_hdb_roles.sql

...r-compose/timescaledb/resources/04_hdb_ext_aggregates.sql

docker-compose/timescaledb/resources/05_lofar_views.sql

docker-compose/timescaledb/resources/06_cleanup.sql

docker/tango/tango-archiver-ts/Dockerfile

docker/tango/tango-archiver/data/archiver-devices.json

...tationcontrol/tangostationcontrol/clients/opcua_client.py

tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py

...rol/tangostationcontrol/test/clients/test_opcua_client.py