Fix for TESB-13581
Merge branch 'master' of github.com:Talend/tesb-rt-se