Update Marconi to Zaqar

This patch updates the remaining Marconi references to Zaqar.

Change-Id: I2e9ecf0a8cf56c9abcba2af98d000bfd2796ee78
Merge "Update Marconi to Zaqar"