Backport TESB-12365
Merge branch 'dev-5.3' of github.com:Talend/tesb-rt-se into dev-5.3