NXP-15558: cleanup
NXP-15558: Allow multiple templates in Config command