Clean up view bake templates output
Merge pull request #3403 from bcrowe/3.0-bake-templates

3.0 - Clean up view bake templates output