Updated openstack/openstack
Project: openstack/neutron  5acc09e2d6ed879dee5e592c027824108d877fd2

Fix non-existent 'assert' calls to mocks

Fixes calls to non-existent 'assert' methods
called on mock objects.

Closes-Bug: #1320774
Change-Id: I7eab28fc9b23cbb39d5507ff3e8004a493c90bed
Updated openstack/openstack
Project: openstack/glance  ebe31a037261fcba179470fab1a5ebcb2ba28dda

Removing duplicate entry from base_conf

Removing duplicate enable_v2_api entry.

Change-Id: Id1c531771810310887dbb5a6b8e6f0e4571547bf