Synchronize with trunk up to r120997
Merge branch 'master' into spring-32

Synchronize spring-32 branch to trunk r120997.

Small conflicts below resolve trivially - trunk wins in each case.

Conflicts:
	src/jobscheduler/scheduler-events-model/src/hibernate/org/sakaiproject/scheduler/events/hibernate/TriggerEventHibernateImpl.hbm.xml
	src/podcasts/podcasts/pom.xml
	src/search/elasticsearch/pack/pom.xml