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

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: