Fix FELIX-3749 (https://issues.apache.org/jira/browse/FELIX-3749) Apply patch from Guillaume Sauthier, forgot some files...