FELIX-360: apply the rest of Carlos' fixes

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