SOC-3511 | CLONE - Error in Suggestion Portlet due to [o.e.p.c.r.s.S.Peo...

...pleRestServices]

Conflicts:
	component/core/src/main/java/org/exoplatform/social/core/storage/impl/StorageUtils.java
	component/core/src/test/java/org/exoplatform/social/core/storage/StorageUtilsTest.java