Merge branch 'master' into L2SS-696_temperature_management_device

docker-compose/alerta-server/lofar-routing-plugin/setup.py

docker-compose/alerta-web

docker-compose/alerta-web/rules.json

docker-compose/alerta.yml

docker-compose/dsconfig/Dockerfile

docker-compose/dsconfig/manage_object_properties.py

docker-compose/dsconfig/merge_json.py

docker-compose/grafana/Dockerfile

docker-compose/grafana/alerting.json

docker-compose/grafana/dashboards/apsct.json

docker-compose/grafana/dashboards/apspu.json

docker-compose/grafana/dashboards/archiver_timescale.json

docker-compose/grafana/dashboards/docker.json

docker-compose/grafana/dashboards/home.json

docker-compose/grafana/dashboards/home2.json

docker-compose/grafana/dashboards/lcu.json

docker-compose/grafana/dashboards/recv.json

docker-compose/grafana/dashboards/sdp.json

docker-compose/grafana/dashboards/sst.json

docker-compose/grafana/dashboards/version-information.json