Refactored some placeholders to support both QueryJ and TemplatePackaging. Added TemplatePackagingFillTemplateChainWrapper. refs #418