Round 3 of shellshock updates
Merge pull request #1590 from edx/cg/shellshock3

Round 3 of shellshock updates