Fixed merge conflicts

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