Apply contribution from FELIX-3751.



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