STAT-344 merge trunk r120829

git-svn-id: https://source.sakaiproject.org/svn/sitestats/branches/sitestats-2.3.x@120830 66ffb92e-73f9-0310-93c1-f5514f145a0a