Merge branch 'dev' into 'metrics'

# Conflicts:
#   README.md
#   flight-management/pom.xml
#   flight-management/src/main/resources/application.yml
#   messenger/pom.xml
#   reporter/src/main/resources/application.properties
#   resource-management/pom.xml