IGNORE (NO MASTER) Hack support for correct answer

Don't merge this change back in to master!

[#4286066]

It was to solve this particular problem in an emergency

See PT: http://www.pivotaltracker.com/story/show/4286066
IGNORE (NO MASTER) Hack support for correct answer
frozen as itsisu-units. Merge staging. Resolved .

the itsisu-units branch mirrors what this branch was.
The units branch should be frozen.

This branch is now tracking new portal changes.

There were some conflicts, merged by hand.
Merge branch 'itsisu-dev' into itsisu-production
Undo bad merge commit.
Merge branch 'itsisu-staging' into itsisu-production
Merge branch 'itsisu-dev' into itsisu-production
Merge branch 'itsisu-dev' into itsisu-production
Merge branch 'itsisu-dev' into itsisu-production
Merge branch 'itsisu-dev' into itsisu-production
Merge branch 'itsisu-dev' into itsisu-production
Merge branch 'itsisu-dev' into itsisu-production
Merge branch 'itsisu-dev' into itsisu-production
Merge branch 'itsisu-dev' into itsisu-production
Merge branch 'itsisu-dev' into itsisu-production
Merge branch 'itsisu-dev' into itsisu-production
Merge branch 'itsisu-dev' into itsisu-production
Merge branch 'itsisu-staging' into itsisu-production
Merge branch 'itsisu-dev' into itsisu-production
Merge branch 'itsisu-dev' into itsisu-production