bugfix: merge 2 when: clauses
Merge pull request #614 from edx/jbau/edxapp/codejail

bugfix: merge 2 when: clauses