FELIX-360: more fixes from Carlos

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