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

Synchronize spring-32 branch to trunk r124929

A few HBM/POM XML conflicts resolved trivially.

Conflicts:
	src/edu-services/cm-service/cm-impl/hibernate-impl/impl/pom.xml
	src/entitybroker/pom.xml
	src/kernel/pom.xml
	src/lessonbuilder/hbm/src/java/org/sakaiproject/lessonbuildertool/simplepageitem.hbm.xml
	src/lessonbuilder/pom.xml
	src/mailsender/pom.xml
	src/master/pom.xml
	src/msgcntr/messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/MessageImpl.hbm.xml
	src/samigo/samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/assessment/PublishedItemData.hbm.xml
	src/samigo/samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/grading/GradingData.hbm.xml
	src/warehouse/pom.xml