[Openstack-stable-maint] Stable check of openstack/zaqar for ref refs/heads/stable/pike failed

Merge Failed. This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.