DOCS-1575 x509 tweaks