LPS-34134 Improve autocomplete JSON to separate variables and types
LPS-34134 SF
LPS-34244 SF
LPS-34158 Add save and continue button when editing a template

I just copied this code from the code of journal/edit_template.jsp in v6.1
LPS-34158 SF