RES-50 merge trunk r111676

git-svn-id: https://source.sakaiproject.org/svn/reset-pass/branches/reset-pass-2.8.x@118805 66ffb92e-73f9-0310-93c1-f5514f145a0a
RES-47 merge trunk r108401

git-svn-id: https://source.sakaiproject.org/svn/reset-pass/branches/reset-pass-2.8.x@118806 66ffb92e-73f9-0310-93c1-f5514f145a0a