SOS-1578
SOS-1578 Partial reverse (reverse-merged from commit 7f8c8f143441e015e79ee6b0a6d5e90b7545761e) since removing these properties will cause problem in 6.1.x, even it fixes issue in 6.2
LPS-34860 Add more search container columns
LPS-35137 Compat
LPS-29713 Whenever we can edit the map address we should load it unless the value is blank
LPS-34277 - Allow message to be sent along with friend request (back-end only)
LPS-34277 - Allow message to be sent along with friend request
LPS-34277 - Source formatting
LPS-34277 SF
LPS-34277 Lang keys
LPS-35004 SF
LPS-35182 XSS in portletResource inside plugins
LPS-34600 Unable to serialize with JBoss 5.1
LPS-35350
LPS-35355 sample-jsp-portlet is not a MVC portlet
LPS-35349 ServiceBeanMethodInvocationFactoryUtil should return Object
LPS-35358 Compat
LPS-35358 Apply
LPS-35358 fix compat
LPS-34860 Make scopable