PRFL-699 merge r103397 from trunk

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

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