Fix short echo CS in view bake templates
Merge pull request #4341 from bcrowe/3.0-bake-views-cs

3.0 - Fix short echo CS in view bake templates