Merge changes I9b47bb4f,Ia7564665

* changes:
  Fix getIssuerAlternativeNames() test
  Make sure alternativeNames are unmodifiable