Making a branch for KNL-1118


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/KNL-1118@129406 66ffb92e-73f9-0310-93c1-f5514f145a0a
Committing fix for KNL-1118 - Configuration for setting cache isn't consistent


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/KNL-1118@129407 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1118 Merging https://source.sakaiproject.org/svn//kernel/branches/KNL-1118/ branch to trunk
Branch by Matt Jones (Longsight)



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