Add defaults independent of the edxapp role.
Add missed vars.
Merge pull request #771 from edx/feanil/demo_common_dep

Feanil/demo common dep