Fix errors, warnings generated when Sphinx renders docs
Merge pull request #1355 from eeshangarg/bug-1354-fix-sphinx-errors-and-warnings

Fix errors, warnings generated when Sphinx renders docs