SAK-22396 merge trunk r110566

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