ENYO-3672: fix bugs regarding substitution

Changes
* fix bug to substitute file contents using substit.vars
* fix bug to use both of substit.json and substitu.vars together

Enyo-DCO-1.1-Signed-off-by Junil Kim <logyourself@gmail.com>