Fixes for .br, .lt and Neustar templates
Merge remote-tracking branch 'origin/template_fixes'