FELIX-1626: fix some remaining bits

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