STAT-389 STAT-390 merge 311972 from trunk

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