SAM-2157 calculated question - fixed issue with multiple calcs in extract and with changing variables not reflected in calcs

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