This patch is to rollback the change introduced by
https://review.openstack.org/#/c/73100/. 73100 is no longer needed
because of the recent https://review.openstack.org/#/c/69497/.
Using 'marconi' as the service name will keep us aligned with the
naming convention used by other projects.
Change-Id: I5da6d2aaeb5c9dc29a1cbc70c8425449807eb34c