MOBILE-561 - Formatting velocity templates