#25657 include statement now supportes environment variable expansion.
This allows paths declared via the include or includes statements in 
the templates.yml or environment files to contain environment variables.
Merge branch 'master' into 25435_hook_defaults