Updating requirements to use new Sphinx.
Misc. small fixes.

(cherry picked from commit b5f285a2a72537cc0433feca3e14fced8b6b5b71)