adding missing semicolon
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master', remote branch 'upstream/master'
UP-3451 Add generic cache entry tagging API

Add API that allows for cache entries to be tagged for tracking
Add username tagging and purging for some caches

Conflicts:

	uportal-war/src/main/resources/properties/contexts/cacheContext.xml
	uportal-war/src/main/resources/properties/ehcache.xml
UP-3507 Make profile selector session key consistent
UP-3477 Clean up logging and logic for mutex handling
UP-3477 Significant refactoring of JPA DAOs

Create base JPA DAO classes for each persistence context. These provide
the EntityManager, TransactionOperations and Transactional meta-annotations
for concrete DAO implementations.

Create base JPA DAO test classes. These parallel the base JPA DAO classes
and provide the required context for the JPA DAO unit tests.

Add indexes to PersistentPortalEvent for better aggregation query performance

Add indexes to LoginAggregationImpl for better aggregation query performance

Add EntityManager lifecycle events

Add EntityManager lifecycle scoped cache. This is useful for some very high-
volume JPA daos that need to cache entities for the duration of the EntityManager's
life

Set the EntityManager to COMMIT FlushMode for event aggregation to prevent early
flushes from killing performance.

Add EventAggregationContext interface which IPortalEventAggregators can use to store
information for the duration of an event aggregation session. This relieves the need
to run queries more than once during an aggregation session and provides a place to
store newly created entities for later use in the same session.

Enable batching of JDBC insert/update/delete to reduce the number of database round
trips required.

Conflicts:

	uportal-war/src/main/resources/properties/contexts/schedulerContext.xml
	uportal-war/src/test/java/org/jasig/portal/test/BaseJpaDaoTest.java
	uportal-war/src/test/resources/log4j.properties
UP-3477 Refactor EventSession filtering

Move filtered session tracking into the aggregation context
UP-3451 Fix cleanup of tag tracking to remove cleaned out tag sets
UP-3477 Clean up EntityManager related caching
UP-3477 Working on event aggregation

Conflicts:

	uportal-war/.springBeans
UP-3477 Complete SQL design for query by date/time

Conflicts:

	events.sql
UP-3477 Get date+time range queries working

Also get uncompleted login aggregation query working
UP-3477 Add concurrent user aggregator

Conflicts:

	uportal-war/src/main/data/default_entities/event-aggregation/default.event-aggregation.xml