Updated openstack/openstack
Project: openstack/cinder  b996096375dec153be66755f3ba38446f275af94
null
Use six.moves cStringIO instead of cStringIO

to keep Python 3.x compatibility, use six.moves.cStringIO to
replace StringIO

Change-Id: Id89c6156d9bba0007e8b16cd2cc28413a7cc5fd3
Closes-Bug: #1280964
Updated openstack/openstack
Project: openstack/tempest  bf4c20fb7e71c452690b7f4dc65e1621b3765ba2
null
Add test for OS::Neutron::Router Heat resource

Added a test that checks that a OS::Neutron::Router is created
correctly.
Replaced all OS::Quantum with OS::Neutron.
Replaced all Ref with get_param or get_resource.
Lower case instead of Upper case when applies.

Change-Id: I9f4828eee8517422847c05fbb45530699abe8e96
Partial-Bug: #1269569