'origin/Feature/Add_Rest_Api_with_Java_client' into feature_split_repo_into_api_impl # Conflicts: # hawkbit-repository/src/test/java/org/eclipse/hawkbit/TestDataUtil.java Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
'origin/Feature/Add_Rest_Api_with_Java_client' into feature_split_repo_into_api_impl # Conflicts: # hawkbit-repository/src/test/java/org/eclipse/hawkbit/TestDataUtil.java Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>