POLL-155 merge trunk r106202

git-svn-id: https://source.sakaiproject.org/svn/polls/branches/polls-1.4.x@118825 66ffb92e-73f9-0310-93c1-f5514f145a0a
POLL-176 merge trunk r113262,113265

git-svn-id: https://source.sakaiproject.org/svn/polls/branches/polls-1.4.x@118826 66ffb92e-73f9-0310-93c1-f5514f145a0a
POLL-152 merge trunk r94048

git-svn-id: https://source.sakaiproject.org/svn/polls/branches/polls-1.4.x@118828 66ffb92e-73f9-0310-93c1-f5514f145a0a
POLL-159 merge grunk r97211

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