Fix FELIX-4199 and FELIX-4200

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