FELIX-3720 Apply slightly modified patch by Alexander Berger (thanks alot)

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1399617 13f79535-47bb-0310-9956-ffa450edef68
3 files changed