FELIX-3729 fix circular reference problems

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