Merging SAK-26036 updates to config


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