SAM-2157 calculated question - fix for variables not matching properly in some cases (includes test cases)

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