SIGNUP-145 : merge fixed into this branch

git-svn-id: https://source.sakaiproject.org/svn/signup/branches/2-7-x@305599 66ffb92e-73f9-0310-93c1-f5514f145a0a