More refactoring on Template Packaging template contexts. refs #459