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.
Merge branch 'master' of github.com:Jasig/uPortal