SOC-3899 | [Activity Viewer] More icon is displayed on Liker part after comment on activity
SOC-3931 | [Notifications] Cache configurations on social-extension is wrong due to merge process
DOC-3046 Social JAVA APIs: Check spelling and English
UI-3095  New user activity - support Cloud team: update new icons
SOC-3939 | [Feature][Stabilization] Update CF version
SOC-3885 | Error when view activity stream
SOC-3885 | Fix UT failed
SOC-3863 | Update version of kernel | core | jcr | ws to be compliant with gatein 3.7.x
SOC-3889: fix Feedmash job issue
Merge branch 'feature/stabilization'
SOC-3863 : Update version of kernel | core | jcr | ws to be compliant with gatein 3.7.x (revert)
Merge remote-tracking branch 'origin/feature/stabilization'
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ

Conflicts:
	extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/cache-configuration.xml
 SOC-3931 : [Notifications] Cache configurations on social-extension is wrong due to merge process : Resolve the merge conflict of master