FELIX-3400 applied the patch with some small changes to keep it 1.3 compatible

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1304235 13f79535-47bb-0310-9956-ffa450edef68
1 file changed