fix compile

git-svn-id: https://source.sakaiproject.org/svn/profile2/branches/profile2-1.4.x@118918 66ffb92e-73f9-0310-93c1-f5514f145a0a
PRFL-791 merge trunk r117542

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

git-svn-id: https://source.sakaiproject.org/svn/profile2/branches/profile2-1.4.x@118924 66ffb92e-73f9-0310-93c1-f5514f145a0a
PRFL-753 merge trunk r111724

git-svn-id: https://source.sakaiproject.org/svn/profile2/branches/profile2-1.4.x@118925 66ffb92e-73f9-0310-93c1-f5514f145a0a
PRFL-671 merge trunk r98971

git-svn-id: https://source.sakaiproject.org/svn/profile2/branches/profile2-1.4.x@118927 66ffb92e-73f9-0310-93c1-f5514f145a0a
PRFL-714 merge trunk r106240

git-svn-id: https://source.sakaiproject.org/svn/profile2/branches/profile2-1.4.x@118928 66ffb92e-73f9-0310-93c1-f5514f145a0a
PRFL-747 merge trunk 109444

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

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

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

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