formatter: fix broken bfe_comments
- Fixes the broken import statement in bfe_comments.
- Changes slightly an if statement in format_with_format_template to catch more cases.
Co-authored-by: Konstantinos Kousidis <konstantinos.kousidis@cern.ch>
NOTE: beware, patch amended by Tibor to use new file names