Fix for CDir in file wrappings

For getTemplateWrapping() and getIncludesWrapping(), they need to be
made relative using getCDir().
Merge remote-tracking branch 'origin/master' into templated-emails