[3.6] bpo-35605: Fix documentation build for sphinx<1.6#11368

ned-deily merged 2 commits intopython:3.6python/cpython:3.6from

asottile:sphinx_logging_build_regressionasottile/cpython:sphinx_logging_build_regressionCopy head branch name to clipboard