Updated from global requirements

Change-Id: I3b1cd7aac5c9603dfaccbd4ae30d07cbf7c96da2
Don't import form keystoneclient.openstack.common

The keystoneclient.openstack.common directory is where we sync files
from oslo incubator. It is not a public directory and should not be
being consumed by openstackclient.

Change-Id: I011bb95c2c824e2dbc4b822ca922ae77b8d9b955
Merge "Updated from global requirements"