Merge master

40ccbe7b · Sören Henning · 8d69ba7a · cac915db · 40ccbe7b · 8d69ba7a
Commit 40ccbe7b authored 4 years ago by Sören Henning
--- a/execution/uc-application/base/aggregation-deployment.yaml
+++ b/execution/uc-application/base/aggregation-deployment.yaml
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/uc3-application/src/main/java/theodolite/uc3/application/ConfigurationKeys.java
+++ b/uc3-application/src/main/java/theodolite/uc3/application/ConfigurationKeys.java