PRFL-851 merge r307166 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/profile2/branches/sakai-10.x@307302 66ffb92e-73f9-0310-93c1-f5514f145a0a
PRFL-836 merge r307208 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/profile2/branches/sakai-10.x@307304 66ffb92e-73f9-0310-93c1-f5514f145a0a
PRFL-855 merge r30168 to 10.x

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