2nd fix for https://jira.talendforge.org/browse/TESB-7707
Merge branch 'master' of https://github.com/Talend/tesb-rt-se