checkpoint for keystone auth
pep8 cleanup
Merge remote-tracking branch 'upstream/master'
pep8 cleanup