SVN: merge branches/release-4-0-0-M2 to trunk-4-0

git-svn-id: https://svn.javlin.eu/svn/cloveretl.opensource/trunk-4-0@16321 a09ad3ba-1a0f-0410-b1b9-c67202f10d70