Merge "Correct intersphinx mapping for cert-service"