UP-4034:  Add a portlet preference to the portal-activity portlet to toggle display of popular searches

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