STAT-383 merge 309841 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/sitestats/branches/sakai-10.x@309912 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25625 merge 308378 to 10.x

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