Workaround for bz1035399
lint
Flake fixes
Merge pull request #930 from slouderm/test_login

Flake fixes