Merge branch 'cc/smartServiceDiscovery-peerfactsim' of...

Merge branch 'cc/smartServiceDiscovery-peerfactsim' of https://cabrerac@dev.kom.e-technik.tu-darmstadt.de/gitlab/simonstrator/simonstrator-peerfactsim.git into cc/smartServiceDiscovery-peerfactsim