Merge branch 'develop' of git.rwth-aachen.de:acs/public/cloud/mas/clonemap into develop

16 jobs for develop in 3 minutes and 6 seconds (queued for 4 seconds)