Rename Marconi to Zaqar

2 files missed the rename patch, this patch renames those files.

Change-Id: Ic0393fe577a6bfc170ebb9de5a7db4f27d76d28c
Merge "Rename Marconi to Zaqar"
Merge branch 'master' of https://github.com/openstack-dev/devstack