Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Conflict fixed manually (cherry picked from commit apache/camel-k@781e5072b)
- Loading branch information
Conflict fixed manually (cherry picked from commit apache/camel-k@781e5072b)