SAK-23573 merge trunk r123574

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