KNL-1051 merge trunk r122162

git-svn-id: https://source.sakaiproject.org/svn/polls/branches/polls-1.5.x@122982 66ffb92e-73f9-0310-93c1-f5514f145a0a