INTEG-282 When editing a webcontent, comments lines are divided into different activity comments

Fix description: Add only 1 comment when editing the node.

Conflicts:

	integ-ecms/integ-ecms-social/src/main/java/org/exoplatform/wcm/ext/component/activity/listener/Utils.java
Merge commit 'b5811bc519137b1d7c48ad07c593d0d1c134841e' into HEAD