Update x509 to patch 7.4
Merge branch '6.0p1'

* 6.0p1:
  Update x509 to patch 7.4

Conflicts:
	distinfo
Update x509 for 6.1p1