Rearranged statement whitespace in Velocity macros
(cherry picked from commit 7bc9660)
Polishing
(cherry picked from commit 8f484d3)