Update x509 for 6.2p1 and patch 7.4.1