FELIX-1030: apply patch from Dennis Geurts to fix issues revealed by new tests

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