Fixed merge conflicts

Change-Id: Icbfe1ed4bb677256758a6106700925aec4ee8bd5
Signed-off-by: Johannes Wendel <johannes.wendel@iese.fraunhofer.de>
17 files changed