KNL-1162 Numerous fixes and tweaks
Made the new ehcache implementation support the cache loader

git-svn-id: https://source.sakaiproject.org/svn/kernel/trunk@308010 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1162 Cleanup of the new cache implementations

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