Consistent usage of short echo and sprintf
Escape error template message output
Merge pull request #4102 from bcrowe/3.0-CS

3.0 - Consistent usage of short echo and sprintf