Group JINJA statements with their comments

**Description**
CRM will render all JINJA variable setting statements at the top of the file. Sometimes, these statements have their use clarified by accompanying comments/comment blocks.

Would it be possible to pull the comments/comment blocks up to the top of the file along with the JINJA variable definition statements themselves, so as to preserve context ?
