The ec2-api team has merged all of their zuul migration import patches and we are ready to approve https://review.openstack.org/#/c/597582/