FELIX-4401 fix tests and test assumptions

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