6d846590bc
This commit is a collection of follow-up fixes to the nits/comments on https://review.openstack.org/#/c/206244/116 Change-Id: I5631f5df3c0b6a3baa386da8b93b1e888c1f8d3c