Merge "TrivialFix for flake8 and docs build in tox.ini"