Gustavo patch fixing keystoneclient v3 issues