Rename marconi to zaqar

http://lists.openstack.org/pipermail/openstack-dev/2014-July/041528.html

Change-Id: If0f1c5b82a3c47f3f5d3b96cd2e786b1e836c8d7
Merge "Rename marconi to zaqar"