Updated openstack/openstack
Project: openstack-dev/devstack  5b0438f8ed3a1038f3b260c118b7652a865c1709
null
Add marconi to enabled services

This patch adds marconi to enabled services. This is needed to run
the tempest experimental job for marconi.

Change-Id: I28794c3acacc6daa9f698f8031b58d1ee13c3bad
Implements: blueprint add-basic-marconi-tests