LPS-39800 Avoid using macro in velocity/freemarker template, recommit.