Fix FELIX-4449 and FELIX-4448

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