Rename marconi to zaqar

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