Making code in master compliant with newer flake8 restrictions

Change-Id: Ia39a8c30a277126a34559323144151bf9a68077b