Update more vars that need to use $ instead of jinja.
Merge pull request #1657 from edx/feanil/update_jinja

Update more vars that need to use $ instead of jinja.