PRFL-791 merge trunk r117542

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

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

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

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

git-svn-id: https://source.sakaiproject.org/svn/profile2/branches/profile2-1.5.x@118935 66ffb92e-73f9-0310-93c1-f5514f145a0a
PRFL-730 merge trunk r108958,110644

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