FELIX-1464 applied the patch with the exception of one change that I commented on in the issue.

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