SAK-22318 merge r109481 from trunk

git-svn-id: https://source.sakaiproject.org/svn/entitybroker/branches/entitybroker-1.5.x@122147 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22708 merge r120572 from trunk


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