aaa
eeeqq
qqq
Merge branch 'branches/branch-5.3' into branches/branch-5.4

Conflicts:
	TestProject1/src/org/talend/test/TestClass2.java
aab

Conflicts:
	TestProject1/src/org/talend/test/TestClass2.java
lll
fff (+1 squashed commit)
Squashed commits:
[3cc1878] kkk

fff