FELIX-4060 : Minor refactoring; code cleanup

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