SVN: merge trunk-3-4 to trunk-3-5

git-svn-id: https://svn.javlin.eu/svn/cloveretl.opensource/trunk-3-5@16364 a09ad3ba-1a0f-0410-b1b9-c67202f10d70