Updated openstack/openstack
Project: openstack/glance  4e7c8e6d553e9d187b6c7f6eb284b4b7d63cfd74
null
Use packaged version of ordereddict

Removes the need for ordereddict source to exist in the project.
Uses collections.OrderedDict for python2.7 and above and falls
back to ordereddict.OrderedDict for python2.6

Fixes bug 1229569

Change-Id: Iaf8b500d7b340f370df239bfe9ab0656575dc93b
Updated openstack/openstack
Project: openstack/nova  2fa29f7cf108453e4445d16f0a593f818428395e
null
Refactor unit tests code for python3 compatability

The builtin basestring abstract type was removed in python3,
use str instead, we need to using six.string_types to replace
the basestring for py3 compatibility.

Partial Implements bp basestring-py3-compatible

Change-Id: I0f6a0f9ca4e17800407f3c1bbdce11a46288f693