added FELIX-3910, FELIX-4285

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