IZPACK-970 - post-fix with another approach to not break the existing API

Included also a unit test for this