comments from review incoroporated

Review on openstack-infra has prompted updates:
https://review.openstack.org/#/c/117892/4
https://review.openstack.org/#/c/119245

Change-Id: Ibb07d8c549a7cb0cc311898a8fa5217b7d205609