Added support in the strawman for re-authentication

Also a handful of flake8 cleanups

Change-Id: Iee9340b5639d175e5bad699fb894fc043e929581