Accommodate interface changes in 35042 and 34926

This depends on a couple of upstream changes:

https://review.openstack.org/#/c/34926/
https://review.openstack.org/#/c/35042/