LPS-32066 backport is broken for so-portlet / activities

• Type: Regression Bug
• Status: Closed
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: 2.1.X EE
• Fix Version/s: 2.1.X CE, 2.1.0 EE GA3
• Component/s: Social Office Dashboard, Social Office Dashboard > Activities
• Labels: None
• Branch Version/s:
  6.1.x
• Backported to Branch:
  Committed
• Affects Portal Version/s:
  6.1.20 EE GA2
• Similar Issues: Show 5 results ; ;

  SOS-340	Separate so-portlet into so-hook and so-portlet
  SOS-811	so-portlet fails to build
  SOS-359	Upgrade for so-portlet breaks on first run.
  SOS-1646	6.2.x so-portlet compile error
  SOS-2122	In so-portlet, notifications portlet needs to be cleaned up

The ee-6.1.20 branch cannot be deployed:

An error occurred at line: 23 in the jsp file: /activities/init.jsp
PortletPreferences cannot be resolved to a type
20: <%@ include file="/init.jsp" %>
21:
22: <%
23: PortletPreferences preferences = renderRequest.getPreferences();
24:
25: String portletResource = ParamUtil.getString(request, "portletResource");
26:

PASSED Manual Testing.

Fixed on:
Tomcat 7 + MySQL 5. Portal 6.1.20.
Plugins 6.1.20 EE Git ID: e75a8f88ecc80ce32ae5e0783bf9368d60ae56c9.