Added -n to sphinx builds to catch issues going forward. Backport of 9b5f64cc6e from master.
Backport of c13912ac7f from master