FELIX-3334 applied the patch with a slight change

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