[sphinx] cleanup and fixes

13 jobs for fixing-sphinx in 10 minutes and 15 seconds (queued for 7 seconds)