SAK-26199 manual merge of r309358 as log4j was being included in the WAR because of old 0.7.4 RSF


git-svn-id: https://source.sakaiproject.org/svn/reset-pass/branches/reset-pass-2.9.x@310000 66ffb92e-73f9-0310-93c1-f5514f145a0a