PRFL-811 merge trunk r121689

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