Fix FELIX-4054
https://issues.apache.org/jira/browse/FELIX-4054

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