No un-indexed curly braces on string `.format()` calls
Easier path building
No last line
Lint white-space fixes.
Merge pull request #8986 from s0undt3ch/hotfix/jenkins

Lint Fixes