Merge branch 'activity-poc-agg2' into paris2013
Merge branch 'paris2013' of http://github.com/sakaiproject/Hilary into paris2013
(Paris2013) Logical merge conflict between PP+Activities: Messages are still queued when there is no listener now.