SAM-2278 Timed assessments with File Upload questions will throw exception
Patch from Paul Dagnall (udayton.edu)



git-svn-id: https://source.sakaiproject.org/svn/sam/trunk@270750 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2250 fix for missing i18n string in calculated question
Patch from Diego del Blanco Orobitg



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