APSTUD-5655: Code formatter conflicts with PEP8 E261. Fixed some introduced issues with places where formatting of comments should not take place (shebang line and block comments).
Fixed the build.
Merge branch 'release'