Merge pull request #378 from KurtStam/master

fix for https://bugzilla.redhat.com/show_bug.cgi?id=1016644 - zip archiv...
https://bugzilla.redhat.com/show_bug.cgi?id=1030518, locking camel version to fix tests
merger