FELIX-2158 Apply my FELIX-2158-2.patch

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