UP-3908: Cherry-pick 4cfb5d

Conflicts:
	uportal-war/src/main/webapp/WEB-INF/jsp/Activity/activity.jsp