RES-53 merge trunk r116957,118112,121358

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