Reverse merging SAK-19072


git-svn-id: https://source.sakaiproject.org/svn/authz/trunk@132877 66ffb92e-73f9-0310-93c1-f5514f145a0a