Re-apply FELIX-843 patch to latest BND code

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