Fixes for in-code documentation

Fixes a couple of issues that slid by on review
https://review.openstack.org/85651

Change-Id: I2dd19c6d0af9c7c3148811aeb8299656d1afc788
Merge "Fixes for in-code documentation"