UP-3629 Made report labeling a strategy that can be plugged in per report controller
UP-3648:  Enhancement to place (optionally) some config outside uPortal build/deploy process
UP-3532 Use tagged purging for portlet caches

Setup tagged cache keys for the public and private portlet content caches. The
public cache keys are tagged with the portlet definition id. The private cache
keys are tagged with sessionId and sessionId + portlet window id. This allows
portlet action based invalidation as well as user session based invalidation
as well.
UP-3649:  Bump the bundled email-preview portlet to version 2.0.3
UP-3541 Strip comments from layout doc on import

Remove all comments from layout document before import to
prevent skipping nodes
Merge pull request #103 from jameswennmacher/UP-3629

UP-3629 Made report labeling a strategy pluggable per report controller
UP-3651 Aggregate nothing if no config preset
UP-3652
Add a "maxResults" configuration option to the PersonLookupHelper bean that controls the maximum number of results returned from a person lookup request. This option is controlled via an entry in the portal.properties file.
UP-3632 Refactor the "Popular Portlets" controller logic to use the new aggregation methods/data.
UP-3632
Refactor the "Popular Portlets" controller logic to use the new aggregation methods/data.
UP-3632 Clean up popular portlets controller

Convert from web-flow to simple controller based portlet
Add query API to PortletLayoutAggregationDao so a single query can be used to get all of the data
Use resource request for JSON data load
Use new url syntax for links to popular portlets
UP-3624 Add cookie enforcement filter

Add a filter to the "/Login" URL pattern that will determine whether cookies are enabled on the remote browser. If cookies are not enabled then a redirect will be performed to the PortletError/cookies.jsp view with a message alerting the user that cookies are required.

Conflicts:
	uportal-war/src/main/webapp/WEB-INF/web.xml
UP-3645
Add a feature to filter the Portlet Registry by status