PRFL-768 merge r114934 from trunk


git-svn-id: https://source.sakaiproject.org/svn/profile2/branches/profile2-1.5.x@121303 66ffb92e-73f9-0310-93c1-f5514f145a0a
PRFL-775 merge r115218,115817 from trunk


git-svn-id: https://source.sakaiproject.org/svn/profile2/branches/profile2-1.5.x@121304 66ffb92e-73f9-0310-93c1-f5514f145a0a
PRFL-762 merge r116140 from trunk


git-svn-id: https://source.sakaiproject.org/svn/profile2/branches/profile2-1.5.x@121305 66ffb92e-73f9-0310-93c1-f5514f145a0a
PRFL-779 merge r115216 from trunk


git-svn-id: https://source.sakaiproject.org/svn/profile2/branches/profile2-1.5.x@121306 66ffb92e-73f9-0310-93c1-f5514f145a0a
PRFL-732 merge r110591 from trunk


git-svn-id: https://source.sakaiproject.org/svn/profile2/branches/profile2-1.5.x@121307 66ffb92e-73f9-0310-93c1-f5514f145a0a
PRFL-777 merge r115217 from trunk


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