KARAF-1851

[Andrei Pozolotin]

    *Jean-Baptiste, Ioannis*

    please review / merge

    https://issues.apache.org/jira/browse/KARAF-1851

    Thank you,

    Andrei