Move fix for https://jira.talendforge.org/browse/TESB-7707 from master to 5.2