FELIX-4984 fix some circular reference problems

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