Merge changes from CVS

  * Enable adding in memory CA cert to cert store
  * GT-489: xio_gsi errors with OpenSSL 1.0.1e