PRFL-640 merge trunk r106239 - some parts alredy merged

git-svn-id: https://source.sakaiproject.org/svn/profile2/branches/profile2-1.5.x@122630 66ffb92e-73f9-0310-93c1-f5514f145a0a
PRFL-797 perge trunk r121691

git-svn-id: https://source.sakaiproject.org/svn/profile2/branches/profile2-1.5.x@122633 66ffb92e-73f9-0310-93c1-f5514f145a0a
PRFL-802 merge trunk r121695

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