fixes #5520 - proper capitalization in orchestration header
Fixes #4287 - Join directly to template_combinations when resolving templates