Updated openstack/openstack
Project: openstack-dev/devstack  19bff77d20dcc22cdfe403cdc35c19117ee51393
null
Fix Issues in Marconi integration

This patch fixes a couple of issues, that prevents marconi from running
on devstack.

Change-Id: I47060a0334ad6f90f1402b34c83bb6ad22f723d4
Closes-Bug: #1260820