Merge remote-tracking branch 'origin/lab/20-21-acs-6-2' into jz/int-dmaa

# Conflicts:
#	src/de/tud/kom/p2psim/api/topology/component/ControllableLocationActuator.java
#	src/de/tud/kom/p2psim/impl/topology/component/UAVTopologyComponent.java