SAK-25843 merge 307093, 307568 from trunk

git-svn-id: https://source.sakaiproject.org/svn/entitybroker/branches/sakai-10.x@315799 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26623 merge 315380 from trunk

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