Merge pull request #2026 from nickvergessen/ticket/12184

[ticket/12184] Fix undefined variable tpl_fields in profile field manager

* nickvergessen/ticket/12184:
  [ticket/12184] Fix undefined variable tpl_fields in profile field manager
Merge remote-tracking branch 'bantu/ticket/12180' into develop

* bantu/ticket/12180:
  [ticket/12180] Add "Each file MUST end with exactly one newline character" rule