TDI-31321: commit on 5.3&5.4&5.5
https://jira.talendforge.org/browse/TDI-31321
for TDI-30309