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
Merge "Fix Issues in Marconi integration"