Fix sphinx warnings

Getting rid of a couple of warnings that are generated during the
documentation build.

Closes-Bug: #1392780

Change-Id: I2ebc8f1ec49ff80331077a653f0e73c988153898
Merge "Fix sphinx warnings"