tidy up/refactor in prep for FELIX-2500


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