More comments to doc strings

This patch continues to change comments back to doc strings.

Co-Authored With: Jamie Lennox <jamielennox@redhat.com>

Change-Id: I1618344f49cf151cf30ed5470417b27962a70999
Merge "More comments to doc strings"