Check FELIX-4380
(https://issues.apache.org/jira/browse/FELIX-4380)

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