Merge changes If11202d9,Ib67395e8

* changes:
  X509CertificateTest: test for empty subjectAltNames
  Track Bouncycastle fixes for subjectAltNames