Fix FELIX-3749 (https://issues.apache.org/jira/browse/FELIX-3749)

Apply patch from Guillaume Sauthier, forgot some files...

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