Updated openstack/openstack
Project: openstack/python-troveclient  0909082787bbee5e8a077365bc6609575c970f55
null
Add Python 3 classifiers

Closes-Bug: 1288264
Change-Id: I99c5b19127e66288b5121d6a1399df1b4be0e890
Updated openstack/openstack
Project: openstack/python-keystoneclient  a446dd80d0d3c0c6294da430eda954fea643dd37
null
Revert "Authenticate via oauth"

This reverts commit 149e1128818aacb24654f990430791562054fa93.

This commit I958983f505e261e3f1920a8df66eced3258b001e broke
stable/havana by introducing a dependency on oauthlib, but oauthlib
isn't in the stable/havana branch of global dependencies (fix in
progress Ib2e2aa2e75e7b7b43e0534eeb62e748d1edc0bc3). And we use trunk
clients in stable/havana gate jobs. So this patch broke both heat and
horizon, both of which import this file to support keystone's v3 API.

Change-Id: I56f7a8d2d2ddce0565f29bf29628555e4fe3c761