Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths' into maint