Pylint fixes
Detect "FIX" comments with pylint
Unify filename var with other _prepare_*() functions
Fix indentation in YAML example

Mixed 2 and 3 space indentations.
Verticalize code
Sink is a valid unused argument
Merge pull request #7611 from holmboe/virt-pylint

Pylint fixups