merge from 3.5

Issue20969 - Set the Epub Author and Epub Publisher in Python docs.