This change is required as Zaza underwent a split of the openstack
tests from the Zaza project, so we had to track the working branch
until that change landed. As it has landed, it is now time to use
Zaza from master again
Change-Id: If00d8883005aaf3bcab1277250644a2d97412d32