[2.7] bpo-30380: Fix Sphinx 1.6.1 warnings. (GH-1613)#1616

serhiy-storchaka merged 2 commits intopython:2.7python/cpython:2.7from

serhiy-storchaka:backport-d97b7dc-2.7serhiy-storchaka/cpython:backport-d97b7dc-2.7Copy head branch name to clipboard